build(deps): bump com.android.tools:desugar_jdk_libs from 2.1.2 to 2.1.3

Bumps [com.android.tools:desugar_jdk_libs](https://github.com/google/desugar_jdk_libs) from 2.1.2 to 2.1.3.
- [Changelog](https://github.com/google/desugar_jdk_libs/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/desugar_jdk_libs/commits)

---
updated-dependencies:
- dependency-name: com.android.tools:desugar_jdk_libs
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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

.github/workflows/build.yml

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

.github/workflows/ci.yml

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

.github/workflows/release.yml

@@ -1,4 +1,4 @@
-name: publish
+name: release-android
 
 on:
   schedule:
@@ -31,8 +31,6 @@ on:
         required: false
         default: nightly
   workflow_call:
-env:
-  UPLOAD_DIR_ANDROID: android_artifacts
 
 jobs:
   check_commits:
@@ -55,57 +53,77 @@ jobs:
           # This script checks for commits newer than 23 hours ago
           NEW_COMMITS=$(git rev-list --count --after="$(date -Iseconds -d '23 hours ago')" ${{ github.sha }})
           echo "new_commits=$NEW_COMMITS" >> $GITHUB_OUTPUT
-
   build:
-    if: ${{ inputs.release_type != 'none' }}
-    uses: ./.github/workflows/build.yml
-    secrets: inherit
-    with:
-      build_type: ${{ inputs.release_type == '' && 'nightly' || inputs.release_type }}
-
-  publish:
-    needs:
-      - check_commits
-      - build
+    needs: check_commits
     if: ${{ needs.check_commits.outputs.has_new_commits > 0 && inputs.release_type != 'none' }}
     name: Build Signed APK
     runs-on: ubuntu-latest
     env:
+      SIGNING_KEY_ALIAS: ${{ secrets.SIGNING_KEY_ALIAS }}
+      SIGNING_KEY_PASSWORD: ${{ secrets.SIGNING_KEY_PASSWORD }}
+      SIGNING_STORE_PASSWORD: ${{ secrets.SIGNING_STORE_PASSWORD }}
+      KEY_STORE_FILE: 'android_keystore.jks'
+      KEY_STORE_LOCATION: ${{ github.workspace }}/app/keystore/
       GH_USER: ${{ secrets.GH_USER }}
       # GH needed for gh cli
       GH_TOKEN: ${{ secrets.GH_TOKEN }}
       GH_REPO: ${{ github.repository }}
 
     steps:
+      - uses: actions/checkout@v4
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: '17'
+          cache: gradle
+      - name: Grant execute permission for gradlew
+        run: chmod +x gradlew
+
       - name: Install system dependencies
         run: |
           sudo apt update && sudo apt install -y gh apksigner
 
-      # update latest tag
-      - name: Set latest tag
-        uses: rickstaa/action-create-tag@v1
-        id: tag_creation
+      # Here we need to decode keystore.jks from base64 string and place it
+      # in the folder specified in the release signing configuration
+      - name: Decode Keystore
+        id: decode_keystore
+        uses: timheuer/base64-to-file@v1.2
         with:
-          tag: "latest"  # or any tag name you wish to use
-          message: "Automated tag for HEAD commit"
-          force_push_tag: true
-          tag_exists_error: false
+          fileName: ${{ env.KEY_STORE_FILE }}
+          fileDir: ${{ env.KEY_STORE_LOCATION }}
+          encodedString: ${{ secrets.KEYSTORE }}
 
-      - name: Get latest release
-        id: latest_release
-        uses: kaliber5/action-get-release@v1
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          latest: true
+      # create keystore path for gradle to read
+      - name: Create keystore path env var
+        run: |
+          store_path=${{ env.KEY_STORE_LOCATION }}${{ env.KEY_STORE_FILE }}
+          echo "KEY_STORE_PATH=$store_path" >> $GITHUB_ENV
 
-      - name: Generate Changelog
-        id: changelog
-        uses: requarks/changelog-action@v1
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          toTag: ${{ github.event_name == 'schedule' && 'nightly' || steps.latest_release.outputs.tag_name }}
-          fromTag: "latest"
-          writeToFile: false  # we won't write to file, just output
+      - name: Create service_account.json
+        id: createServiceAccount
+        run: echo '${{ secrets.SERVICE_ACCOUNT_JSON }}' > service_account.json
+
+      # Build and sign APK ("-x test" argument is used to skip tests)
+      # add fdroid flavor for apk upload
+      - name: Build Fdroid Release APK
+        if: ${{ inputs.release_type != '' && inputs.release_type == 'release' }}
+        run: ./gradlew :app:assembleFdroidRelease -x test
+
+      - name: Build Fdroid Prerelease APK
+        if: ${{ inputs.release_type != '' && inputs.release_type == 'prerelease' }}
+        run: ./gradlew :app:assembleFdroidPrerelease -x test
+
+      - name: Build Fdroid Nightly APK
+        if: ${{ inputs.release_type == '' || inputs.release_type == 'nightly' }}
+        run: ./gradlew :app:assembleFdroidNightly -x test
+
+      - if: ${{ inputs.release_type == '' || inputs.release_type == 'nightly' }}
+        run: echo "APK_PATH=$(find . -regex '^.*/build/outputs/apk/fdroid/nightly/.*\.apk$' -type f | head -1)" >> $GITHUB_ENV
+      - if: ${{ inputs.release_type != '' && inputs.release_type == 'release' }}
+        run: echo "APK_PATH=$(find . -regex '^.*/build/outputs/apk/fdroid/release/.*\.apk$' -type f | head -1)" >> $GITHUB_ENV
+      - if: ${{ inputs.release_type != '' && inputs.release_type == 'prerelease' }}
+        run: echo "APK_PATH=$(find . -regex '^.*/build/outputs/apk/fdroid/prerelease/.*\.apk$' -type f | head -1)" >> $GITHUB_ENV
 
       - name: Get version code
         if: ${{ inputs.release_type == 'release' }}
@@ -128,14 +146,25 @@ jobs:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           branch: ${{ github.ref }}
 
-      - name: Make download dir
-        run: mkdir ${{ github.workspace }}/temp
+      # Save the APK after the Build job is complete to publish it as a Github release in the next job
+      - name: Upload APK
+        uses: actions/upload-artifact@v4.4.3
+        with:
+          name: wgtunnel
+          path: ${{ env.APK_PATH }}
 
-      - name: Download artifacts
+      - name: Download APK from build
         uses: actions/download-artifact@v4
         with:
-          name: ${{ env.UPLOAD_DIR_ANDROID }}
-          path: ${{ github.workspace }}/temp
+          name: wgtunnel
+
+      - name: Repository Dispatch for my F-Droid repo
+        uses: peter-evans/repository-dispatch@v3
+        if: ${{ inputs.release_type == 'release' }}
+        with:
+          token: ${{ secrets.PAT }}
+          repository: zaneschepke/fdroid
+          event-type: fdroid-update
 
       # Setup TAG_NAME, which is used as a general "name"
       - if: github.event_name == 'workflow_dispatch'
@@ -166,9 +195,7 @@ jobs:
 
       - name: Get checksum
         id: checksum
-        run: |
-          file_path=$(find ${{ github.workspace }}/temp -type f -iname "*.apk" | tail -n1)
-          echo "checksum=$(apksigner verify -print-certs $file_path | grep -Po "(?<=SHA-256 digest:) .*" | tr -d "[:blank:]")" >> $GITHUB_OUTPUT
+        run: echo "checksum=$(apksigner verify -print-certs ${{ env.APK_PATH }} | grep -Po "(?<=SHA-256 digest:) .*" | tr -d "[:blank:]")" >> $GITHUB_OUTPUT
 
 
       - name: Create Release with Fastlane changelog notes
@@ -182,9 +209,6 @@ jobs:
 
             SHA256 fingerprint:
             ```${{ steps.checksum.outputs.checksum }}```
-
-            ### Changelog
-            ${{ steps.changelog.outputs.changes }}
           tag_name: ${{ env.TAG_NAME }}
           name: ${{ env.TAG_NAME }}
           draft: false
@@ -192,19 +216,6 @@ jobs:
           make_latest: ${{ inputs.release_type == 'release' }}
           files: ${{ github.workspace }}/${{ env.APK_PATH }}
 
-  publish-fdroid:
-    runs-on: ubuntu-latest
-    needs:
-      - publish-github
-    if: inputs.release_type == 'release'
-    steps:
-      - name: Dispatch update for fdroid repo
-        uses: peter-evans/repository-dispatch@v3
-        with:
-          token: ${{ secrets.ANDROID_PAT }}
-          repository: zaneschepke/fdroid
-          event-type: fdroid-update
-
   publish-play:
     if: ${{ inputs.track != 'none' && inputs.track != '' }}
     name: Publish to Google Play

README.md

@@ -5,6 +5,7 @@ WG Tunnel
 <div align="center">
 
 [![Discord](https://img.shields.io/badge/Discord-%235865F2.svg?style=for-the-badge&logo=discord&logoColor=white)](https://discord.gg/rbRRNh6H7V)
+[![X Community](https://img.shields.io/badge/X-000000?style=for-the-badge&logo=x&logoColor=white)](https://twitter.com/i/communities/1780655267685736818)
 [![Telegram](https://img.shields.io/badge/Telegram-2CA5E0?style=for-the-badge&logo=telegram&logoColor=white)](https://t.me/wgtunnel)
 
 </div>

app/build.gradle.kts

@@ -31,14 +31,6 @@ android {
 		generateLocaleConfig = true
 	}
 
-	//reproducibility
-	dependenciesInfo {
-		// Disables dependency metadata when building APKs.
-		includeInApk = false
-		// Disables dependency metadata when building Android App Bundles.
-		includeInBundle = false
-	}
-
 	defaultConfig {
 		applicationId = Constants.APP_ID
 		minSdk = Constants.MIN_SDK

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

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

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

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

app/src/main/AndroidManifest.xml

@@ -68,10 +68,7 @@
         <activity
             android:name=".ui.MainActivity"
             android:exported="true"
-			android:windowSoftInputMode="adjustResize"
-            android:theme="@style/Theme.WireguardAutoTunnel"
-			android:configChanges="orientation|screenSize|keyboardHidden"
-			>
+            android:theme="@style/Theme.WireguardAutoTunnel">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -79,6 +76,9 @@
                 <category android:name="android.intent.category.LEANBACK_LAUNCHER" />
                 <action android:name="android.service.quicksettings.action.QS_TILE_PREFERENCES" />
             </intent-filter>
+            <meta-data
+                android:name="android.app.shortcuts"
+                android:resource="@xml/shortcuts" />
         </activity>
         <activity
             android:name="com.journeyapps.barcodescanner.CaptureActivity"
@@ -155,7 +155,7 @@
 				android:value="true" />
 		</service>
         <service
-            android:name=".service.foreground.autotunnel.AutoTunnelService"
+            android:name=".service.foreground.AutoTunnelService"
             android:enabled="true"
             android:exported="false"
             android:foregroundServiceType="systemExempted"
@@ -202,10 +202,5 @@
 				<action android:name="com.wireguard.android.action.REFRESH_TUNNEL_STATES" />
 			</intent-filter>
 		</receiver>
-		<receiver
-			android:name=".receiver.NotificationActionReceiver"
-			android:exported="false"
-			android:permission="${applicationId}.permission.CONTROL_TUNNELS">
-		</receiver>
     </application>
 </manifest>

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

@@ -1,16 +1,13 @@
 package com.zaneschepke.wireguardautotunnel
 
 import android.app.Application
+import android.content.Context
 import android.os.StrictMode
 import android.os.StrictMode.ThreadPolicy
 import com.zaneschepke.logcatter.LogReader
-import com.zaneschepke.wireguardautotunnel.data.repository.AppStateRepository
-import com.zaneschepke.wireguardautotunnel.data.repository.SettingsRepository
+import com.zaneschepke.wireguardautotunnel.data.datastore.LocaleStorage
 import com.zaneschepke.wireguardautotunnel.module.ApplicationScope
 import com.zaneschepke.wireguardautotunnel.module.IoDispatcher
-import com.zaneschepke.wireguardautotunnel.module.MainDispatcher
-import com.zaneschepke.wireguardautotunnel.service.tunnel.BackendState
-import com.zaneschepke.wireguardautotunnel.service.tunnel.TunnelService
 import com.zaneschepke.wireguardautotunnel.util.LocaleUtil
 import com.zaneschepke.wireguardautotunnel.util.ReleaseTree
 import com.zaneschepke.wireguardautotunnel.util.extensions.isRunningOnTv
@@ -18,13 +15,16 @@ import dagger.hilt.android.HiltAndroidApp
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
 import timber.log.Timber
 import javax.inject.Inject
 
 @HiltAndroidApp
 class WireGuardAutoTunnel : Application() {
 
+	val localeStorage: LocaleStorage by lazy {
+		LocaleStorage(this)
+	}
+
 	@Inject
 	@ApplicationScope
 	lateinit var applicationScope: CoroutineScope
@@ -32,23 +32,10 @@ class WireGuardAutoTunnel : Application() {
 	@Inject
 	lateinit var logReader: LogReader
 
-	@Inject
-	lateinit var appStateRepository: AppStateRepository
-
-	@Inject
-	lateinit var settingsRepository: SettingsRepository
-
-	@Inject
-	lateinit var tunnelService: TunnelService
-
 	@Inject
 	@IoDispatcher
 	lateinit var ioDispatcher: CoroutineDispatcher
 
-	@Inject
-	@MainDispatcher
-	lateinit var mainDispatcher: CoroutineDispatcher
-
 	override fun onCreate() {
 		super.onCreate()
 		instance = this
@@ -65,25 +52,15 @@ class WireGuardAutoTunnel : Application() {
 		} else {
 			Timber.plant(ReleaseTree())
 		}
-
-		applicationScope.launch {
-			withContext(mainDispatcher) {
-				if (appStateRepository.isLocalLogsEnabled() && !isRunningOnTv()) logReader.initialize()
-			}
-			if (!settingsRepository.getSettings().isKernelEnabled) {
-				tunnelService.setBackendState(BackendState.SERVICE_ACTIVE, emptyList())
-			}
-			appStateRepository.getLocale()?.let {
-				LocaleUtil.changeLocale(it)
+		if (!isRunningOnTv()) {
+			applicationScope.launch(ioDispatcher) {
+				logReader.start()
 			}
 		}
 	}
 
-	override fun onTerminate() {
-		applicationScope.launch {
-			tunnelService.setBackendState(BackendState.INACTIVE, emptyList())
-		}
-		super.onTerminate()
+	override fun attachBaseContext(base: Context) {
+		super.attachBaseContext(LocaleUtil.getLocalizedContext(base, LocaleStorage(base).getPreferredLocale()))
 	}
 
 	companion object {

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

@@ -11,7 +11,7 @@ import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
 
 @Database(
 	entities = [Settings::class, TunnelConfig::class],
-	version = 13,
+	version = 11,
 	autoMigrations =
 	[
 		AutoMigration(from = 1, to = 2),
@@ -41,14 +41,6 @@ import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
 			to = 11,
 			spec = RemoveTunnelPauseMigration::class,
 		),
-		AutoMigration(
-			from = 11,
-			to = 12,
-		),
-		AutoMigration(
-			from = 12,
-			to = 13,
-		),
 	],
 	exportSchema = true,
 )

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

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

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

@@ -44,9 +44,6 @@ interface TunnelConfigDao {
 	@Query("UPDATE TunnelConfig SET is_mobile_data_tunnel = 0 WHERE is_mobile_data_tunnel =1")
 	suspend fun resetMobileDataTunnel()
 
-	@Query("UPDATE TunnelConfig SET is_ethernet_tunnel = 0 WHERE is_ethernet_tunnel =1")
-	suspend fun resetEthernetTunnel()
-
 	@Query("SELECT * FROM TUNNELCONFIG WHERE is_primary_tunnel=1")
 	suspend fun findByPrimary(): TunnelConfigs
 

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

@@ -26,8 +26,6 @@ class DataStoreManager(
 		val currentSSID = stringPreferencesKey("CURRENT_SSID")
 		val pinLockEnabled = booleanPreferencesKey("PIN_LOCK_ENABLED")
 		val tunnelStatsExpanded = booleanPreferencesKey("TUNNEL_STATS_EXPANDED")
-		val isLocalLogsEnabled = booleanPreferencesKey("LOCAL_LOGS_ENABLED")
-		val locale = stringPreferencesKey("LOCALE")
 		val theme = stringPreferencesKey("THEME")
 	}
 

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

@@ -0,0 +1,17 @@
+package com.zaneschepke.wireguardautotunnel.data.datastore
+
+import android.content.Context
+import android.content.SharedPreferences
+import com.zaneschepke.wireguardautotunnel.util.LocaleUtil
+
+class LocaleStorage(context: Context) {
+	private var preferences: SharedPreferences = context.getSharedPreferences("sp", Context.MODE_PRIVATE)
+
+	fun getPreferredLocale(): String {
+		return preferences.getString("preferred_locale", LocaleUtil.OPTION_PHONE_LANGUAGE)!!
+	}
+
+	fun setPreferredLocale(localeCode: String) {
+		preferences.edit().putString("preferred_locale", localeCode).apply()
+	}
+}

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

@@ -7,8 +7,6 @@ data class GeneralState(
 	val isBatteryOptimizationDisableShown: Boolean = BATTERY_OPTIMIZATION_DISABLE_SHOWN_DEFAULT,
 	val isPinLockEnabled: Boolean = PIN_LOCK_ENABLED_DEFAULT,
 	val isTunnelStatsExpanded: Boolean = IS_TUNNEL_STATS_EXPANDED,
-	val isLocalLogsEnabled: Boolean = IS_LOGS_ENABLED_DEFAULT,
-	val locale: String? = null,
 	val theme: Theme = Theme.AUTOMATIC,
 ) {
 	companion object {
@@ -16,6 +14,5 @@ data class GeneralState(
 		const val BATTERY_OPTIMIZATION_DISABLE_SHOWN_DEFAULT = false
 		const val PIN_LOCK_ENABLED_DEFAULT = false
 		const val IS_TUNNEL_STATS_EXPANDED = false
-		const val IS_LOGS_ENABLED_DEFAULT = false
 	}
 }

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

@@ -60,24 +60,4 @@ data class Settings(
 		defaultValue = "false",
 	)
 	val isWifiNameByShellEnabled: Boolean = false,
-	@ColumnInfo(
-		name = "is_stop_on_no_internet_enabled",
-		defaultValue = "false",
-	)
-	val isStopOnNoInternetEnabled: Boolean = false,
-	@ColumnInfo(
-		name = "is_vpn_kill_switch_enabled",
-		defaultValue = "false",
-	)
-	val isVpnKillSwitchEnabled: Boolean = false,
-	@ColumnInfo(
-		name = "is_kernel_kill_switch_enabled",
-		defaultValue = "false",
-	)
-	val isKernelKillSwitchEnabled: Boolean = false,
-	@ColumnInfo(
-		name = "is_lan_on_kill_switch_enabled",
-		defaultValue = "false",
-	)
-	val isLanOnKillSwitchEnabled: Boolean = false,
 )

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

@@ -5,7 +5,6 @@ import androidx.room.Entity
 import androidx.room.Index
 import androidx.room.PrimaryKey
 import com.wireguard.config.Config
-import com.zaneschepke.wireguardautotunnel.util.extensions.toWgQuickString
 import java.io.InputStream
 
 @Entity(indices = [Index(value = ["name"], unique = true)])
@@ -58,21 +57,12 @@ data class TunnelConfig(
 		defaultValue = "null",
 	)
 	var pingIp: String? = null,
-	@ColumnInfo(
-		name = "is_ethernet_tunnel",
-		defaultValue = "false",
-	)
-	var isEthernetTunnel: Boolean = false,
 ) {
 
 	fun toAmConfig(): org.amnezia.awg.config.Config {
 		return configFromAmQuick(if (amQuick != "") amQuick else wgQuick)
 	}
 
-	fun toWgConfig(): Config {
-		return configFromWgQuick(wgQuick)
-	}
-
 	companion object {
 
 		fun configFromWgQuick(wgQuick: String): Config {
@@ -89,21 +79,6 @@ data class TunnelConfig(
 			}
 		}
 
-		fun tunnelConfigFromAmConfig(config: org.amnezia.awg.config.Config, name: String): TunnelConfig {
-			val amQuick = config.toAwgQuickString(true)
-			val wgQuick = config.toWgQuickString()
-			return TunnelConfig(name = name, wgQuick = wgQuick, amQuick = amQuick)
-		}
-
 		const val AM_QUICK_DEFAULT = ""
-
-		val IPV4_PUBLIC_NETWORKS = setOf(
-			"0.0.0.0/5", "8.0.0.0/7", "11.0.0.0/8", "12.0.0.0/6", "16.0.0.0/4", "32.0.0.0/3",
-			"64.0.0.0/2", "128.0.0.0/3", "160.0.0.0/5", "168.0.0.0/6", "172.0.0.0/12",
-			"172.32.0.0/11", "172.64.0.0/10", "172.128.0.0/9", "173.0.0.0/8", "174.0.0.0/7",
-			"176.0.0.0/4", "192.0.0.0/9", "192.128.0.0/11", "192.160.0.0/13", "192.169.0.0/16",
-			"192.170.0.0/15", "192.172.0.0/14", "192.176.0.0/12", "192.192.0.0/10",
-			"193.0.0.0/8", "194.0.0.0/7", "196.0.0.0/6", "200.0.0.0/5", "208.0.0.0/4",
-		)
 	}
 }

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

@@ -17,6 +17,10 @@ interface AppStateRepository {
 
 	suspend fun setBatteryOptimizationDisableShown(shown: Boolean)
 
+	suspend fun getCurrentSsid(): String?
+
+	suspend fun setCurrentSsid(ssid: String)
+
 	suspend fun isTunnelStatsExpanded(): Boolean
 
 	suspend fun setTunnelStatsExpanded(expanded: Boolean)
@@ -25,13 +29,5 @@ interface AppStateRepository {
 
 	suspend fun getTheme(): Theme
 
-	suspend fun isLocalLogsEnabled(): Boolean
-
-	suspend fun setLocalLogsEnabled(enabled: Boolean)
-
-	suspend fun setLocale(localeTag: String)
-
-	suspend fun getLocale(): String?
-
 	val generalStateFlow: Flow<GeneralState>
 }

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

@@ -38,6 +38,14 @@ class DataStoreAppStateRepository(
 		dataStoreManager.saveToDataStore(DataStoreManager.batteryDisableShown, shown)
 	}
 
+	override suspend fun getCurrentSsid(): String? {
+		return dataStoreManager.getFromStore(DataStoreManager.currentSSID)
+	}
+
+	override suspend fun setCurrentSsid(ssid: String) {
+		dataStoreManager.saveToDataStore(DataStoreManager.currentSSID, ssid)
+	}
+
 	override suspend fun isTunnelStatsExpanded(): Boolean {
 		return dataStoreManager.getFromStore(DataStoreManager.tunnelStatsExpanded)
 			?: GeneralState.IS_TUNNEL_STATS_EXPANDED
@@ -61,22 +69,6 @@ class DataStoreAppStateRepository(
 		} ?: Theme.AUTOMATIC
 	}
 
-	override suspend fun isLocalLogsEnabled(): Boolean {
-		return dataStoreManager.getFromStore(DataStoreManager.isLocalLogsEnabled) ?: GeneralState.IS_LOGS_ENABLED_DEFAULT
-	}
-
-	override suspend fun setLocalLogsEnabled(enabled: Boolean) {
-		dataStoreManager.saveToDataStore(DataStoreManager.isLocalLogsEnabled, enabled)
-	}
-
-	override suspend fun setLocale(localeTag: String) {
-		dataStoreManager.saveToDataStore(DataStoreManager.locale, localeTag)
-	}
-
-	override suspend fun getLocale(): String? {
-		return dataStoreManager.getFromStore(DataStoreManager.locale)
-	}
-
 	override val generalStateFlow: Flow<GeneralState> =
 		dataStoreManager.preferencesFlow.map { prefs ->
 			prefs?.let { pref ->
@@ -92,8 +84,6 @@ class DataStoreAppStateRepository(
 						pref[DataStoreManager.pinLockEnabled]
 							?: GeneralState.PIN_LOCK_ENABLED_DEFAULT,
 						isTunnelStatsExpanded = pref[DataStoreManager.tunnelStatsExpanded] ?: GeneralState.IS_TUNNEL_STATS_EXPANDED,
-						isLocalLogsEnabled = pref[DataStoreManager.isLocalLogsEnabled] ?: GeneralState.IS_LOGS_ENABLED_DEFAULT,
-						locale = pref[DataStoreManager.locale],
 						theme = getTheme(),
 					)
 				} catch (e: IllegalArgumentException) {

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

@@ -53,19 +53,6 @@ class RoomTunnelConfigRepository(
 		}
 	}
 
-	override suspend fun updateEthernetTunnel(tunnelConfig: TunnelConfig?) {
-		withContext(ioDispatcher) {
-			tunnelConfigDao.resetEthernetTunnel()
-			tunnelConfig?.let {
-				save(
-					it.copy(
-						isEthernetTunnel = true,
-					),
-				)
-			}
-		}
-	}
-
 	override suspend fun delete(tunnelConfig: TunnelConfig) {
 		withContext(ioDispatcher) {
 			tunnelConfigDao.delete(tunnelConfig)

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

@@ -15,8 +15,6 @@ interface TunnelConfigRepository {
 
 	suspend fun updateMobileDataTunnel(tunnelConfig: TunnelConfig?)
 
-	suspend fun updateEthernetTunnel(tunnelConfig: TunnelConfig?)
-
 	suspend fun delete(tunnelConfig: TunnelConfig)
 
 	suspend fun getById(id: Int): TunnelConfig?

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

@@ -2,11 +2,7 @@ package com.zaneschepke.wireguardautotunnel.module
 
 import android.content.Context
 import com.zaneschepke.logcatter.LogReader
-import com.zaneschepke.logcatter.LogcatReader
-import com.zaneschepke.wireguardautotunnel.service.notification.NotificationService
-import com.zaneschepke.wireguardautotunnel.service.notification.WireGuardNotification
-import com.zaneschepke.wireguardautotunnel.service.shortcut.DynamicShortcutManager
-import com.zaneschepke.wireguardautotunnel.service.shortcut.ShortcutManager
+import com.zaneschepke.logcatter.LogcatCollector
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
@@ -29,18 +25,6 @@ class AppModule {
 	@Singleton
 	@Provides
 	fun provideLogCollect(@ApplicationContext context: Context): LogReader {
-		return LogcatReader.init(storageDir = context.filesDir.absolutePath)
-	}
-
-	@Singleton
-	@Provides
-	fun provideNotificationService(@ApplicationContext context: Context): NotificationService {
-		return WireGuardNotification(context)
-	}
-
-	@Singleton
-	@Provides
-	fun provideShortcutManager(@ApplicationContext context: Context, @IoDispatcher ioDispatcher: CoroutineDispatcher): ShortcutManager {
-		return DynamicShortcutManager(context, ioDispatcher)
+		return LogcatCollector.init(context = context)
 	}
 }

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

@@ -9,11 +9,3 @@ annotation class Kernel
 @Qualifier
 @Retention(AnnotationRetention.BINARY)
 annotation class Userspace
-
-@Qualifier
-@Retention(AnnotationRetention.BINARY)
-annotation class TunnelShell
-
-@Qualifier
-@Retention(AnnotationRetention.BINARY)
-annotation class AppShell

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

@@ -1,15 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.module
-
-import javax.inject.Qualifier
-
-@Qualifier
-@Retention(AnnotationRetention.BINARY)
-annotation class Wifi
-
-@Qualifier
-@Retention(AnnotationRetention.BINARY)
-annotation class MobileData
-
-@Qualifier
-@Retention(AnnotationRetention.BINARY)
-annotation class Ethernet

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

@@ -4,6 +4,8 @@ import com.zaneschepke.wireguardautotunnel.service.network.EthernetService
 import com.zaneschepke.wireguardautotunnel.service.network.MobileDataService
 import com.zaneschepke.wireguardautotunnel.service.network.NetworkService
 import com.zaneschepke.wireguardautotunnel.service.network.WifiService
+import com.zaneschepke.wireguardautotunnel.service.notification.NotificationService
+import com.zaneschepke.wireguardautotunnel.service.notification.WireGuardNotification
 import dagger.Binds
 import dagger.Module
 import dagger.hilt.InstallIn
@@ -13,19 +15,19 @@ import dagger.hilt.android.scopes.ServiceScoped
 @Module
 @InstallIn(ServiceComponent::class)
 abstract class ServiceModule {
+	@Binds
+	@ServiceScoped
+	abstract fun provideNotificationService(wireGuardNotification: WireGuardNotification): NotificationService
 
 	@Binds
-	@Wifi
 	@ServiceScoped
-	abstract fun provideWifiService(wifiService: WifiService): NetworkService
+	abstract fun provideWifiService(wifiService: WifiService): NetworkService<WifiService>
 
 	@Binds
-	@MobileData
 	@ServiceScoped
-	abstract fun provideMobileDataService(mobileDataService: MobileDataService): NetworkService
+	abstract fun provideMobileDataService(mobileDataService: MobileDataService): NetworkService<MobileDataService>
 
 	@Binds
-	@Ethernet
 	@ServiceScoped
-	abstract fun provideEthernetService(ethernetService: EthernetService): NetworkService
+	abstract fun provideEthernetService(ethernetService: EthernetService): NetworkService<EthernetService>
 }

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

@@ -10,7 +10,6 @@ import com.wireguard.android.util.ToolsInstaller
 import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
 import com.zaneschepke.wireguardautotunnel.data.repository.TunnelConfigRepository
 import com.zaneschepke.wireguardautotunnel.service.foreground.ServiceManager
-import com.zaneschepke.wireguardautotunnel.service.notification.NotificationService
 import com.zaneschepke.wireguardautotunnel.service.tunnel.TunnelService
 import com.zaneschepke.wireguardautotunnel.service.tunnel.WireGuardTunnel
 import dagger.Module
@@ -26,18 +25,9 @@ import javax.inject.Singleton
 @Module
 @InstallIn(SingletonComponent::class)
 class TunnelModule {
-
 	@Provides
 	@Singleton
-	@TunnelShell
-	fun provideTunnelRootShell(@ApplicationContext context: Context): RootShell {
-		return RootShell(context)
-	}
-
-	@Provides
-	@Singleton
-	@AppShell
-	fun provideAppRootShell(@ApplicationContext context: Context): RootShell {
+	fun provideRootShell(@ApplicationContext context: Context): RootShell {
 		return RootShell(context)
 	}
 
@@ -50,14 +40,14 @@ class TunnelModule {
 	@Provides
 	@Singleton
 	@Userspace
-	fun provideUserspaceBackend(@ApplicationContext context: Context, @TunnelShell rootShell: RootShell): Backend {
+	fun provideUserspaceBackend(@ApplicationContext context: Context, rootShell: RootShell): Backend {
 		return GoBackend(context, RootTunnelActionHandler(rootShell))
 	}
 
 	@Provides
 	@Singleton
 	@Kernel
-	fun provideKernelBackend(@ApplicationContext context: Context, @TunnelShell rootShell: RootShell): Backend {
+	fun provideKernelBackend(@ApplicationContext context: Context, rootShell: RootShell): Backend {
 		return WgQuickBackend(context, rootShell, ToolsInstaller(context, rootShell), RootTunnelActionHandler(rootShell))
 	}
 
@@ -77,7 +67,6 @@ class TunnelModule {
 		@ApplicationScope applicationScope: CoroutineScope,
 		@IoDispatcher ioDispatcher: CoroutineDispatcher,
 		serviceManager: ServiceManager,
-		notificationService: NotificationService,
 	): TunnelService {
 		return WireGuardTunnel(
 			amneziaBackend,
@@ -87,17 +76,12 @@ class TunnelModule {
 			applicationScope,
 			ioDispatcher,
 			serviceManager,
-			notificationService,
 		)
 	}
 
 	@Singleton
 	@Provides
-	fun provideServiceManager(
-		@ApplicationContext context: Context,
-		@IoDispatcher ioDispatcher: CoroutineDispatcher,
-		appDataRepository: AppDataRepository,
-	): ServiceManager {
-		return ServiceManager(context, ioDispatcher, appDataRepository)
+	fun provideServiceManager(@ApplicationContext context: Context): ServiceManager {
+		return ServiceManager(context)
 	}
 }

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

@@ -5,8 +5,8 @@ import android.content.Context
 import android.content.Intent
 import com.zaneschepke.wireguardautotunnel.data.repository.TunnelConfigRepository
 import com.zaneschepke.wireguardautotunnel.module.ApplicationScope
-import com.zaneschepke.wireguardautotunnel.service.foreground.ServiceManager
 import com.zaneschepke.wireguardautotunnel.service.tunnel.TunnelService
+import com.zaneschepke.wireguardautotunnel.util.extensions.requestTunnelTileServiceStateUpdate
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
@@ -26,9 +26,6 @@ class KernelReceiver : BroadcastReceiver() {
 	@Inject
 	lateinit var tunnelConfigRepository: TunnelConfigRepository
 
-	@Inject
-	lateinit var serviceManager: ServiceManager
-
 	override fun onReceive(context: Context, intent: Intent) {
 		val action = intent.action ?: return
 		applicationScope.launch {
@@ -40,7 +37,7 @@ class KernelReceiver : BroadcastReceiver() {
 						tunnelConfigRepository.save(it.copy(isActive = true))
 					}
 				}
-				serviceManager.updateTunnelTile()
+				context.requestTunnelTileServiceStateUpdate()
 			}
 		}
 	}

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

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

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

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

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

@@ -0,0 +1,556 @@
+package com.zaneschepke.wireguardautotunnel.service.foreground
+
+import android.content.Context
+import android.content.Intent
+import android.net.NetworkCapabilities
+import android.os.IBinder
+import android.os.PowerManager
+import androidx.core.app.ServiceCompat
+import androidx.lifecycle.LifecycleService
+import androidx.lifecycle.lifecycleScope
+import com.wireguard.android.util.RootShell
+import com.zaneschepke.wireguardautotunnel.R
+import com.zaneschepke.wireguardautotunnel.data.domain.Settings
+import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
+import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
+import com.zaneschepke.wireguardautotunnel.module.IoDispatcher
+import com.zaneschepke.wireguardautotunnel.module.MainImmediateDispatcher
+import com.zaneschepke.wireguardautotunnel.service.network.EthernetService
+import com.zaneschepke.wireguardautotunnel.service.network.MobileDataService
+import com.zaneschepke.wireguardautotunnel.service.network.NetworkService
+import com.zaneschepke.wireguardautotunnel.service.network.NetworkStatus
+import com.zaneschepke.wireguardautotunnel.service.network.WifiService
+import com.zaneschepke.wireguardautotunnel.service.notification.NotificationService
+import com.zaneschepke.wireguardautotunnel.service.tunnel.TunnelService
+import com.zaneschepke.wireguardautotunnel.service.tunnel.TunnelState
+import com.zaneschepke.wireguardautotunnel.util.Constants
+import com.zaneschepke.wireguardautotunnel.util.extensions.cancelWithMessage
+import com.zaneschepke.wireguardautotunnel.util.extensions.getCurrentWifiName
+import com.zaneschepke.wireguardautotunnel.util.extensions.isDown
+import com.zaneschepke.wireguardautotunnel.util.extensions.isReachable
+import com.zaneschepke.wireguardautotunnel.util.extensions.onNotRunning
+import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.CompletableDeferred
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.collectLatest
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import timber.log.Timber
+import java.net.InetAddress
+import javax.inject.Inject
+import javax.inject.Provider
+
+@AndroidEntryPoint
+class AutoTunnelService : LifecycleService() {
+	private val foregroundId = 122
+
+	@Inject
+	lateinit var rootShell: Provider<RootShell>
+
+	@Inject
+	lateinit var wifiService: NetworkService<WifiService>
+
+	@Inject
+	lateinit var mobileDataService: NetworkService<MobileDataService>
+
+	@Inject
+	lateinit var ethernetService: NetworkService<EthernetService>
+
+	@Inject
+	lateinit var appDataRepository: AppDataRepository
+
+	@Inject
+	lateinit var notificationService: NotificationService
+
+	@Inject
+	lateinit var tunnelService: Provider<TunnelService>
+
+	@Inject
+	@IoDispatcher
+	lateinit var ioDispatcher: CoroutineDispatcher
+
+	@Inject
+	lateinit var serviceManager: ServiceManager
+
+	@Inject
+	@MainImmediateDispatcher
+	lateinit var mainImmediateDispatcher: CoroutineDispatcher
+
+	private val autoTunnelStateFlow = MutableStateFlow(AutoTunnelState())
+
+	private var wakeLock: PowerManager.WakeLock? = null
+
+	private var wifiJob: Job? = null
+	private var mobileDataJob: Job? = null
+	private var ethernetJob: Job? = null
+	private var pingJob: Job? = null
+	private var networkEventJob: Job? = null
+
+	override fun onCreate() {
+		super.onCreate()
+		lifecycleScope.launch(mainImmediateDispatcher) {
+			kotlin.runCatching {
+				launchWatcherNotification()
+			}.onFailure {
+				Timber.e(it)
+			}
+		}
+	}
+
+	override fun onBind(intent: Intent): IBinder? {
+		super.onBind(intent)
+		// We don't provide binding, so return null
+		return null
+	}
+
+	override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
+		Timber.d("onStartCommand executed with startId: $startId")
+		serviceManager.autoTunnelService.complete(this)
+		return super.onStartCommand(intent, flags, startId)
+	}
+
+	fun start() {
+		kotlin.runCatching {
+			lifecycleScope.launch(mainImmediateDispatcher) {
+				launchWatcherNotification()
+				initWakeLock()
+			}
+			startSettingsJob()
+			startVpnStateJob()
+		}.onFailure {
+			Timber.e(it)
+		}
+	}
+
+	fun stop() {
+		wakeLock?.let {
+			if (it.isHeld) {
+				it.release()
+			}
+		}
+		stopSelf()
+	}
+
+	override fun onDestroy() {
+		cancelAndResetNetworkJobs()
+		cancelAndResetPingJob()
+		serviceManager.autoTunnelService = CompletableDeferred()
+		super.onDestroy()
+	}
+
+	private fun launchWatcherNotification(description: String = getString(R.string.watcher_notification_text_active)) {
+		val notification =
+			notificationService.createNotification(
+				channelId = getString(R.string.watcher_channel_id),
+				channelName = getString(R.string.watcher_channel_name),
+				title = getString(R.string.auto_tunnel_title),
+				description = description,
+			)
+		ServiceCompat.startForeground(
+			this,
+			foregroundId,
+			notification,
+			Constants.SYSTEM_EXEMPT_SERVICE_TYPE_ID,
+		)
+	}
+
+	private fun initWakeLock() {
+		wakeLock =
+			(getSystemService(Context.POWER_SERVICE) as PowerManager).run {
+				val tag = this.javaClass.name
+				newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "$tag::lock").apply {
+					try {
+						Timber.i("Initiating wakelock with 10 min timeout")
+						acquire(Constants.BATTERY_SAVER_WATCHER_WAKE_LOCK_TIMEOUT)
+					} finally {
+						release()
+					}
+				}
+			}
+	}
+
+	private fun startSettingsJob() = lifecycleScope.launch {
+		watchForSettingsChanges()
+	}
+
+	private fun startVpnStateJob() = lifecycleScope.launch {
+		watchForVpnStateChanges()
+	}
+
+	private fun startWifiJob() = lifecycleScope.launch {
+		watchForWifiConnectivityChanges()
+	}
+
+	private fun startMobileDataJob() = lifecycleScope.launch {
+		watchForMobileDataConnectivityChanges()
+	}
+
+	private fun startEthernetJob() = lifecycleScope.launch {
+		watchForEthernetConnectivityChanges()
+	}
+
+	private fun startPingJob() = lifecycleScope.launch {
+		watchForPingFailure()
+	}
+
+	private fun startNetworkEventJob() = lifecycleScope.launch {
+		handleNetworkEventChanges()
+	}
+
+	private suspend fun watchForMobileDataConnectivityChanges() {
+		withContext(ioDispatcher) {
+			Timber.i("Starting mobile data watcher")
+			mobileDataService.networkStatus.collect { status ->
+				when (status) {
+					is NetworkStatus.Available -> {
+						Timber.i("Gained Mobile data connection")
+						autoTunnelStateFlow.update {
+							it.copy(
+								isMobileDataConnected = true,
+							)
+						}
+					}
+
+					is NetworkStatus.CapabilitiesChanged -> {
+						autoTunnelStateFlow.update {
+							it.copy(
+								isMobileDataConnected = true,
+							)
+						}
+						Timber.i("Mobile data capabilities changed")
+					}
+
+					is NetworkStatus.Unavailable -> {
+						autoTunnelStateFlow.update {
+							it.copy(
+								isMobileDataConnected = false,
+							)
+						}
+						Timber.i("Lost mobile data connection")
+					}
+				}
+			}
+		}
+	}
+
+	private suspend fun watchForPingFailure() {
+		withContext(ioDispatcher) {
+			Timber.i("Starting ping watcher")
+			runCatching {
+				do {
+					val vpnState = tunnelService.get().vpnState.value
+					if (vpnState.status == TunnelState.UP) {
+						if (vpnState.tunnelConfig != null) {
+							val config = TunnelConfig.configFromWgQuick(vpnState.tunnelConfig.wgQuick)
+							val results = if (vpnState.tunnelConfig.pingIp != null) {
+								Timber.d("Pinging custom ip : ${vpnState.tunnelConfig.pingIp}")
+								listOf(InetAddress.getByName(vpnState.tunnelConfig.pingIp).isReachable(Constants.PING_TIMEOUT.toInt()))
+							} else {
+								Timber.d("Pinging all peers")
+								config.peers.map { peer ->
+									peer.isReachable()
+								}
+							}
+							Timber.i("Ping results reachable: $results")
+							if (results.contains(false)) {
+								Timber.i("Restarting VPN for ping failure")
+								val cooldown = vpnState.tunnelConfig.pingCooldown
+								tunnelService.get().bounceTunnel(vpnState.tunnelConfig)
+								delay(cooldown ?: Constants.PING_COOLDOWN)
+								continue
+							}
+						}
+					}
+					delay(vpnState.tunnelConfig?.pingInterval ?: Constants.PING_INTERVAL)
+				} while (true)
+			}.onFailure {
+				Timber.e(it)
+			}
+		}
+	}
+
+	private suspend fun watchForSettingsChanges() {
+		Timber.i("Starting settings watcher")
+		withContext(ioDispatcher) {
+			appDataRepository.settings.getSettingsFlow().combine(
+				// ignore isActive changes to allow manual tunnel overrides
+				appDataRepository.tunnels.getTunnelConfigsFlow().distinctUntilChanged { old, new ->
+					old.map { it.isActive } != new.map { it.isActive }
+				},
+			) { settings, tunnels ->
+				autoTunnelStateFlow.value.copy(
+					settings = settings,
+					tunnels = tunnels,
+				)
+			}.collect {
+				Timber.d("got new settings: ${it.settings}")
+				manageJobsBySettings(it.settings)
+				autoTunnelStateFlow.emit(it)
+			}
+		}
+	}
+
+	private suspend fun watchForVpnStateChanges() {
+		Timber.i("Starting vpn state watcher")
+		withContext(ioDispatcher) {
+			tunnelService.get().vpnState.distinctUntilChanged { old, new ->
+				old.tunnelConfig == new.tunnelConfig && old.status == new.status
+			}.collect { state ->
+				autoTunnelStateFlow.update {
+					it.copy(vpnState = state)
+				}
+				state.tunnelConfig?.let {
+					val settings = appDataRepository.settings.getSettings()
+					if (it.isPingEnabled && !settings.isPingEnabled) {
+						pingJob.onNotRunning { pingJob = startPingJob() }
+					}
+					if (!it.isPingEnabled && !settings.isPingEnabled) {
+						cancelAndResetPingJob()
+					}
+				}
+			}
+		}
+	}
+
+	private fun manageJobsBySettings(settings: Settings) {
+		with(settings) {
+			if (isPingEnabled) {
+				pingJob.onNotRunning { pingJob = startPingJob() }
+			} else {
+				cancelAndResetPingJob()
+			}
+			if (isTunnelOnWifiEnabled || isTunnelOnEthernetEnabled || isTunnelOnMobileDataEnabled) {
+				startNetworkJobs()
+			} else {
+				cancelAndResetNetworkJobs()
+			}
+		}
+	}
+
+	private fun startNetworkJobs() {
+		wifiJob.onNotRunning {
+			Timber.i("Wifi job starting")
+			wifiJob = startWifiJob()
+		}
+		ethernetJob.onNotRunning {
+			ethernetJob = startEthernetJob()
+			Timber.i("Ethernet job starting")
+		}
+		mobileDataJob.onNotRunning {
+			mobileDataJob = startMobileDataJob()
+			Timber.i("Mobile data job starting")
+		}
+		networkEventJob.onNotRunning {
+			Timber.i("Network event job starting")
+			networkEventJob = startNetworkEventJob()
+		}
+	}
+
+	private fun cancelAndResetPingJob() {
+		pingJob?.cancelWithMessage("Ping job canceled")
+		pingJob = null
+	}
+
+	private fun cancelAndResetNetworkJobs() {
+		networkEventJob?.cancelWithMessage("Network event job canceled")
+		wifiJob?.cancelWithMessage("Wifi job canceled")
+		ethernetJob?.cancelWithMessage("Ethernet job canceled")
+		mobileDataJob?.cancelWithMessage("Mobile data job canceled")
+		networkEventJob = null
+		wifiJob = null
+		ethernetJob = null
+		mobileDataJob = null
+	}
+
+	private fun updateEthernet(connected: Boolean) {
+		autoTunnelStateFlow.update {
+			it.copy(
+				isEthernetConnected = connected,
+			)
+		}
+	}
+
+	private fun updateWifi(connected: Boolean) {
+		autoTunnelStateFlow.update {
+			it.copy(
+				isWifiConnected = connected,
+			)
+		}
+	}
+
+	private suspend fun watchForEthernetConnectivityChanges() {
+		withContext(ioDispatcher) {
+			Timber.i("Starting ethernet data watcher")
+			ethernetService.networkStatus.collect { status ->
+				when (status) {
+					is NetworkStatus.Available -> {
+						Timber.i("Gained Ethernet connection")
+						updateEthernet(true)
+					}
+
+					is NetworkStatus.CapabilitiesChanged -> {
+						Timber.i("Ethernet capabilities changed")
+						updateEthernet(true)
+					}
+
+					is NetworkStatus.Unavailable -> {
+						updateEthernet(false)
+						Timber.i("Lost Ethernet connection")
+					}
+				}
+			}
+		}
+	}
+
+	private suspend fun watchForWifiConnectivityChanges() {
+		withContext(ioDispatcher) {
+			Timber.i("Starting wifi watcher")
+			wifiService.networkStatus.collect { status ->
+				when (status) {
+					is NetworkStatus.Available -> {
+						Timber.i("Gained Wi-Fi connection")
+						updateWifi(true)
+					}
+
+					is NetworkStatus.CapabilitiesChanged -> {
+						Timber.i("Wifi capabilities changed")
+						updateWifi(true)
+						val ssid = getWifiSSID(status.networkCapabilities)
+						ssid?.let { name ->
+							if (name.contains(Constants.UNREADABLE_SSID)) {
+								Timber.w("SSID unreadable: missing permissions")
+							} else {
+								Timber.i("Detected valid SSID")
+							}
+							appDataRepository.appState.setCurrentSsid(name)
+							autoTunnelStateFlow.update {
+								it.copy(
+									currentNetworkSSID = name,
+								)
+							}
+						} ?: Timber.w("Failed to read ssid")
+					}
+
+					is NetworkStatus.Unavailable -> {
+						updateWifi(false)
+						Timber.i("Lost Wi-Fi connection")
+					}
+				}
+			}
+		}
+	}
+
+	private suspend fun getWifiSSID(networkCapabilities: NetworkCapabilities): String? {
+		return withContext(ioDispatcher) {
+			with(autoTunnelStateFlow.value.settings) {
+				if (isWifiNameByShellEnabled) return@withContext rootShell.get().getCurrentWifiName()
+				wifiService.getNetworkName(networkCapabilities)
+			}
+		}
+	}
+
+	private suspend fun getMobileDataTunnel(): TunnelConfig? {
+		return appDataRepository.tunnels.findByMobileDataTunnel().firstOrNull()
+	}
+
+	private suspend fun handleNetworkEventChanges() {
+		withContext(ioDispatcher) {
+			Timber.i("Starting network event watcher")
+			autoTunnelStateFlow.collectLatest { watcherState ->
+				val autoTunnel = "Auto-tunnel watcher"
+				Timber.d("New watcher state!")
+				// delay for rapid network state changes and then collect latest
+				delay(Constants.WATCHER_COLLECTION_DELAY)
+				val activeTunnel = watcherState.vpnState.tunnelConfig
+				val defaultTunnel = appDataRepository.getPrimaryOrFirstTunnel()
+				when {
+					watcherState.isEthernetConditionMet() -> {
+						Timber.i("$autoTunnel - tunnel on on ethernet condition met")
+						if (watcherState.vpnState.isDown()) {
+							defaultTunnel?.let {
+								tunnelService.get().startTunnel(it)
+							}
+						}
+					}
+
+					watcherState.isMobileDataConditionMet() -> {
+						Timber.i("$autoTunnel - tunnel on mobile data condition met")
+						val mobileDataTunnel = getMobileDataTunnel()
+						val tunnel =
+							mobileDataTunnel ?: defaultTunnel
+						if (watcherState.vpnState.isDown() || activeTunnel?.isMobileDataTunnel == false) {
+							tunnel?.let {
+								tunnelService.get().startTunnel(it)
+							}
+						}
+					}
+
+					watcherState.isTunnelOffOnMobileDataConditionMet() -> {
+						Timber.i("$autoTunnel - tunnel off on mobile data met, turning vpn off")
+						if (!watcherState.vpnState.isDown()) {
+							activeTunnel?.let {
+								tunnelService.get().stopTunnel(it)
+							}
+						}
+					}
+
+					watcherState.isUntrustedWifiConditionMet() -> {
+						Timber.i("Untrusted wifi condition met")
+						if (activeTunnel == null || watcherState.isCurrentSSIDActiveTunnelNetwork() == false ||
+							watcherState.vpnState.isDown()
+						) {
+							Timber.i(
+								"$autoTunnel - tunnel on ssid not associated with current tunnel condition met",
+							)
+							watcherState.getTunnelWithMatchingTunnelNetwork()?.let {
+								Timber.i("Found tunnel associated with this SSID, bringing tunnel up: ${it.name}")
+								if (watcherState.vpnState.isDown() || activeTunnel?.id != it.id) {
+									tunnelService.get().startTunnel(it)
+								}
+							} ?: suspend {
+								Timber.i("No tunnel associated with this SSID, using defaults")
+								val default = appDataRepository.getPrimaryOrFirstTunnel()
+								if (default?.name != tunnelService.get().name || watcherState.vpnState.isDown()) {
+									default?.let {
+										tunnelService.get().startTunnel(it)
+									}
+								}
+							}.invoke()
+						}
+					}
+
+					watcherState.isTrustedWifiConditionMet() -> {
+						Timber.i(
+							"$autoTunnel - tunnel off on trusted wifi condition met, turning vpn off",
+						)
+						if (!watcherState.vpnState.isDown()) activeTunnel?.let { tunnelService.get().stopTunnel(it) }
+					}
+
+					watcherState.isTunnelOffOnWifiConditionMet() -> {
+						Timber.i(
+							"$autoTunnel - tunnel off on wifi condition met, turning vpn off",
+						)
+						if (!watcherState.vpnState.isDown()) activeTunnel?.let { tunnelService.get().stopTunnel(it) }
+					}
+
+					watcherState.isTunnelOffOnNoConnectivityMet() -> {
+						Timber.i(
+							"$autoTunnel - tunnel off on no connectivity met, turning vpn off",
+						)
+						if (!watcherState.vpnState.isDown()) activeTunnel?.let { tunnelService.get().stopTunnel(it) }
+					}
+
+					else -> {
+						Timber.i("$autoTunnel - no condition met")
+					}
+				}
+			}
+		}
+	}
+}

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

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

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

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

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

@@ -6,10 +6,7 @@ import android.os.IBinder
 import androidx.core.app.ServiceCompat
 import androidx.lifecycle.LifecycleService
 import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
-import com.zaneschepke.wireguardautotunnel.service.notification.NotificationAction
 import com.zaneschepke.wireguardautotunnel.service.notification.NotificationService
-import com.zaneschepke.wireguardautotunnel.service.notification.WireGuardNotification
 import com.zaneschepke.wireguardautotunnel.util.Constants
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.CompletableDeferred
@@ -24,13 +21,16 @@ class TunnelBackgroundService : LifecycleService() {
 	@Inject
 	lateinit var serviceManager: ServiceManager
 
+	private val foregroundId = 123
+
 	override fun onCreate() {
 		super.onCreate()
-		serviceManager.backgroundService.complete(this)
+		start()
 	}
 
 	override fun onBind(intent: Intent): IBinder? {
 		super.onBind(intent)
+		// We don't provide binding, so return null
 		return null
 	}
 
@@ -39,11 +39,11 @@ class TunnelBackgroundService : LifecycleService() {
 		return super.onStartCommand(intent, flags, startId)
 	}
 
-	fun start(tunnelConfig: TunnelConfig?) {
+	fun start() {
 		ServiceCompat.startForeground(
 			this,
-			NotificationService.KERNEL_SERVICE_NOTIFICATION_ID,
-			createNotification(tunnelConfig),
+			foregroundId,
+			createNotification(),
 			Constants.SYSTEM_EXEMPT_SERVICE_TYPE_ID,
 		)
 	}
@@ -58,13 +58,12 @@ class TunnelBackgroundService : LifecycleService() {
 		super.onDestroy()
 	}
 
-	private fun createNotification(tunnelConfig: TunnelConfig?): Notification {
+	private fun createNotification(): Notification {
 		return notificationService.createNotification(
-			WireGuardNotification.NotificationChannels.VPN,
-			title = "${getString(R.string.tunnel_running)} - ${tunnelConfig?.name}",
-			actions = listOf(
-				notificationService.createNotificationAction(NotificationAction.TUNNEL_OFF),
-			),
+			getString(R.string.vpn_channel_id),
+			getString(R.string.vpn_channel_name),
+			getString(R.string.tunnel_start_text),
+			description = "",
 		)
 	}
 }

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

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

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

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

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

@@ -1,145 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.service.foreground.autotunnel.model
-
-import com.zaneschepke.wireguardautotunnel.data.domain.Settings
-import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
-import com.zaneschepke.wireguardautotunnel.service.tunnel.VpnState
-import com.zaneschepke.wireguardautotunnel.util.extensions.TunnelConfigs
-import com.zaneschepke.wireguardautotunnel.util.extensions.isMatchingToWildcardList
-
-data class AutoTunnelState(
-	val vpnState: VpnState = VpnState(),
-	val networkState: NetworkState = NetworkState(),
-	val settings: Settings = Settings(),
-	val tunnels: TunnelConfigs = emptyList(),
-) {
-
-	private fun isMobileDataActive(): Boolean {
-		return !networkState.isEthernetConnected && !networkState.isWifiConnected && networkState.isMobileDataConnected
-	}
-
-	private fun isMobileTunnelDataChangeNeeded(): Boolean {
-		val preferredTunnel = preferredMobileDataTunnel()
-		return preferredTunnel != null &&
-			vpnState.status.isUp() && preferredTunnel.id != vpnState.tunnelConfig?.id
-	}
-
-	private fun isEthernetTunnelChangeNeeded(): Boolean {
-		val preferredTunnel = preferredEthernetTunnel()
-		return preferredTunnel != null && vpnState.status.isUp() && preferredTunnel.id != vpnState.tunnelConfig?.id
-	}
-
-	private fun preferredMobileDataTunnel(): TunnelConfig? {
-		return tunnels.firstOrNull { it.isMobileDataTunnel } ?: tunnels.firstOrNull { it.isPrimaryTunnel }
-	}
-
-	private fun preferredEthernetTunnel(): TunnelConfig? {
-		return tunnels.firstOrNull { it.isEthernetTunnel } ?: tunnels.firstOrNull { it.isPrimaryTunnel }
-	}
-
-	private fun preferredWifiTunnel(): TunnelConfig? {
-		return getTunnelWithMatchingTunnelNetwork() ?: tunnels.firstOrNull { it.isPrimaryTunnel }
-	}
-
-	private fun isWifiActive(): Boolean {
-		return !networkState.isEthernetConnected && networkState.isWifiConnected
-	}
-
-	private fun startOnEthernet(): Boolean {
-		return networkState.isEthernetConnected && settings.isTunnelOnEthernetEnabled && vpnState.status.isDown()
-	}
-
-	private fun stopOnEthernet(): Boolean {
-		return networkState.isEthernetConnected && !settings.isTunnelOnEthernetEnabled && vpnState.status.isUp()
-	}
-
-	fun isNoConnectivity(): Boolean {
-		return !networkState.isEthernetConnected && !networkState.isWifiConnected && !networkState.isMobileDataConnected
-	}
-
-	private fun stopOnMobileData(): Boolean {
-		return isMobileDataActive() && !settings.isTunnelOnMobileDataEnabled && vpnState.status.isUp()
-	}
-
-	private fun startOnMobileData(): Boolean {
-		return isMobileDataActive() && settings.isTunnelOnMobileDataEnabled && vpnState.status.isDown()
-	}
-
-	private fun changeOnMobileData(): Boolean {
-		return isMobileDataActive() && settings.isTunnelOnMobileDataEnabled && isMobileTunnelDataChangeNeeded()
-	}
-
-	private fun changeOnEthernet(): Boolean {
-		return networkState.isEthernetConnected && settings.isTunnelOnEthernetEnabled && isEthernetTunnelChangeNeeded()
-	}
-
-	private fun stopOnWifi(): Boolean {
-		return isWifiActive() && !settings.isTunnelOnWifiEnabled && vpnState.status.isUp()
-	}
-
-	private fun stopOnTrustedWifi(): Boolean {
-		return isWifiActive() && settings.isTunnelOnWifiEnabled && vpnState.status.isUp() && isCurrentSSIDTrusted()
-	}
-
-	private fun startOnUntrustedWifi(): Boolean {
-		return isWifiActive() && settings.isTunnelOnWifiEnabled && vpnState.status.isDown() && !isCurrentSSIDTrusted()
-	}
-
-	private fun changeOnUntrustedWifi(): Boolean {
-		return isWifiActive() && settings.isTunnelOnWifiEnabled && vpnState.status.isUp() && !isCurrentSSIDTrusted() && !isWifiTunnelPreferred()
-	}
-
-	private fun isWifiTunnelPreferred(): Boolean {
-		val preferred = preferredWifiTunnel()
-		val vpnTunnel = vpnState.tunnelConfig
-		return if (preferred != null && vpnTunnel != null) {
-			preferred.id == vpnTunnel.id
-		} else {
-			true
-		}
-	}
-
-	fun asAutoTunnelEvent(): AutoTunnelEvent {
-		return when {
-			// ethernet scenarios
-			stopOnEthernet() -> AutoTunnelEvent.Stop
-			startOnEthernet() || changeOnEthernet() -> AutoTunnelEvent.Start(preferredEthernetTunnel())
-			// mobile data scenarios
-			stopOnMobileData() -> AutoTunnelEvent.Stop
-			startOnMobileData() || changeOnMobileData() -> AutoTunnelEvent.Start(preferredMobileDataTunnel())
-			// wifi scenarios
-			stopOnWifi() -> AutoTunnelEvent.Stop
-			stopOnTrustedWifi() -> AutoTunnelEvent.Stop
-			startOnUntrustedWifi() || changeOnUntrustedWifi() -> AutoTunnelEvent.Start(preferredWifiTunnel())
-			// no connectivity
-			isNoConnectivity() && settings.isStopOnNoInternetEnabled -> AutoTunnelEvent.Stop
-			else -> AutoTunnelEvent.DoNothing
-		}
-	}
-
-	private fun isCurrentSSIDTrusted(): Boolean {
-		return networkState.wifiName?.let {
-			hasTrustedWifiName(it)
-		} == true
-	}
-
-	private fun hasTrustedWifiName(wifiName: String, wifiNames: List<String> = settings.trustedNetworkSSIDs): Boolean {
-		return if (settings.isWildcardsEnabled) {
-			wifiNames.isMatchingToWildcardList(wifiName)
-		} else {
-			wifiNames.contains(wifiName)
-		}
-	}
-
-	private fun getTunnelWithMatchingTunnelNetwork(): TunnelConfig? {
-		return networkState.wifiName?.let { wifiName ->
-			tunnels.firstOrNull {
-				hasTrustedWifiName(wifiName, it.tunnelNetworks)
-			}
-		}
-	}
-
-	fun isPingEnabled(): Boolean {
-		return settings.isPingEnabled ||
-			(vpnState.status.isUp() && vpnState.tunnelConfig != null && tunnels.first { it.id == vpnState.tunnelConfig.id }.isPingEnabled)
-	}
-}

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

@@ -1,8 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.service.foreground.autotunnel.model
-
-data class NetworkState(
-	val isWifiConnected: Boolean = false,
-	val isMobileDataConnected: Boolean = false,
-	val isEthernetConnected: Boolean = false,
-	val wifiName: String? = null,
-)

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

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

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

@@ -1,64 +1,18 @@
 package com.zaneschepke.wireguardautotunnel.service.network
 
 import android.content.Context
-import android.net.ConnectivityManager
-import android.net.Network
 import android.net.NetworkCapabilities
-import android.net.NetworkRequest
 import dagger.hilt.android.qualifiers.ApplicationContext
-import kotlinx.coroutines.channels.awaitClose
-import kotlinx.coroutines.flow.callbackFlow
-import kotlinx.coroutines.flow.catch
-import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.flow.onStart
-import timber.log.Timber
 import javax.inject.Inject
 
 class EthernetService
 @Inject
 constructor(
 	@ApplicationContext context: Context,
-) : NetworkService {
+) :
+	BaseNetworkService<EthernetService>(context, NetworkCapabilities.TRANSPORT_ETHERNET) {
 
-	private val connectivityManager =
-		context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
-
-	override val status = callbackFlow {
-		val networkStatusCallback = object : ConnectivityManager.NetworkCallback() {
-			override fun onAvailable(network: Network) {
-				trySend(NetworkStatus.Available(network))
-			}
-			override fun onLost(network: Network) {
-				trySend(NetworkStatus.Unavailable())
-			}
-			override fun onCapabilitiesChanged(network: Network, networkCapabilities: NetworkCapabilities) {
-				trySend(
-					NetworkStatus.CapabilitiesChanged(
-						network,
-						networkCapabilities,
-					),
-				)
-			}
-		}
-		val request =
-			NetworkRequest.Builder()
-				.addTransportType(NetworkCapabilities.TRANSPORT_ETHERNET)
-				.addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
-				.addCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED)
-				.build()
-		connectivityManager.registerNetworkCallback(request, networkStatusCallback)
-
-		awaitClose { connectivityManager.unregisterNetworkCallback(networkStatusCallback) }
-	}.onStart {
-		// needed for services that are not yet available as it will impact later combine flows if we don't emit
-		emit(NetworkStatus.Unavailable())
-	}.catch {
-		Timber.e(it)
-		emit(NetworkStatus.Unavailable())
-	}.map {
-		when (it) {
-			is NetworkStatus.Available, is NetworkStatus.CapabilitiesChanged -> Status(true, null)
-			is NetworkStatus.Unavailable -> Status(false, null)
-		}
+	override fun isNetworkSecure(): Boolean {
+		return true
 	}
 }

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

@@ -1,63 +1,17 @@
 package com.zaneschepke.wireguardautotunnel.service.network
 
 import android.content.Context
-import android.net.ConnectivityManager
-import android.net.Network
 import android.net.NetworkCapabilities
-import android.net.NetworkRequest
 import dagger.hilt.android.qualifiers.ApplicationContext
-import kotlinx.coroutines.channels.awaitClose
-import kotlinx.coroutines.flow.callbackFlow
-import kotlinx.coroutines.flow.catch
-import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.flow.onStart
-import timber.log.Timber
 import javax.inject.Inject
 
 class MobileDataService
 @Inject
 constructor(
 	@ApplicationContext context: Context,
-) : NetworkService {
-	private val connectivityManager =
-		context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
-
-	override val status = callbackFlow {
-		val networkStatusCallback = object : ConnectivityManager.NetworkCallback() {
-			override fun onAvailable(network: Network) {
-				trySend(NetworkStatus.Available(network))
-			}
-			override fun onLost(network: Network) {
-				trySend(NetworkStatus.Unavailable())
-			}
-			override fun onCapabilitiesChanged(network: Network, networkCapabilities: NetworkCapabilities) {
-				trySend(
-					NetworkStatus.CapabilitiesChanged(
-						network,
-						networkCapabilities,
-					),
-				)
-			}
-		}
-		val request =
-			NetworkRequest.Builder()
-				.addTransportType(NetworkCapabilities.TRANSPORT_CELLULAR)
-				.addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
-				.addCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED)
-				.build()
-		connectivityManager.registerNetworkCallback(request, networkStatusCallback)
-
-		awaitClose { connectivityManager.unregisterNetworkCallback(networkStatusCallback) }
-	}.onStart {
-		// needed for services that are not yet available as it will impact later combine flows if we don't emit
-		emit(NetworkStatus.Unavailable())
-	}.catch {
-		Timber.e(it)
-		emit(NetworkStatus.Unavailable())
-	}.map {
-		when (it) {
-			is NetworkStatus.Available, is NetworkStatus.CapabilitiesChanged -> Status(true, null)
-			is NetworkStatus.Unavailable -> Status(false, null)
-		}
+) :
+	BaseNetworkService<MobileDataService>(context, NetworkCapabilities.TRANSPORT_CELLULAR) {
+	override fun isNetworkSecure(): Boolean {
+		return false
 	}
 }

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

@@ -1,27 +1,14 @@
 package com.zaneschepke.wireguardautotunnel.service.network
 
-import android.net.Network
 import android.net.NetworkCapabilities
 import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.map
 
-interface NetworkService {
-	val status: Flow<Status>
-}
-
-inline fun <Result> Flow<NetworkStatus>.map(
-	crossinline onUnavailable: suspend () -> Result,
-	crossinline onAvailable: suspend (network: Network) -> Result,
-	crossinline onCapabilitiesChanged:
-	suspend (network: Network, networkCapabilities: NetworkCapabilities) -> Result,
-): Flow<Result> = map { status ->
-	when (status) {
-		is NetworkStatus.Unavailable -> onUnavailable()
-		is NetworkStatus.Available -> onAvailable(status.network)
-		is NetworkStatus.CapabilitiesChanged ->
-			onCapabilitiesChanged(
-				status.network,
-				status.networkCapabilities,
-			)
+interface NetworkService<T> {
+	fun getNetworkName(networkCapabilities: NetworkCapabilities): String? {
+		return null
 	}
+
+	fun isNetworkSecure(): Boolean
+
+	val networkStatus: Flow<NetworkStatus>
 }

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

@@ -4,11 +4,10 @@ import android.net.Network
 import android.net.NetworkCapabilities
 
 sealed class NetworkStatus {
-	abstract val isConnected: Boolean
-	class Available(val network: Network, override val isConnected: Boolean = true) : NetworkStatus()
+	class Available(val network: Network) : NetworkStatus()
 
-	class Unavailable(override val isConnected: Boolean = false) : NetworkStatus()
+	class Unavailable(val network: Network) : NetworkStatus()
 
-	class CapabilitiesChanged(val network: Network, val networkCapabilities: NetworkCapabilities, override val isConnected: Boolean = true) :
+	class CapabilitiesChanged(val network: Network, val networkCapabilities: NetworkCapabilities) :
 		NetworkStatus()
 }

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

@@ -1,6 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.service.network
-
-data class Status(
-	val available: Boolean,
-	val name: String?,
-)

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

@@ -1,134 +1,22 @@
 package com.zaneschepke.wireguardautotunnel.service.network
 
 import android.content.Context
-import android.net.ConnectivityManager
-import android.net.ConnectivityManager.NetworkCallback.FLAG_INCLUDE_LOCATION_INFO
-import android.net.Network
 import android.net.NetworkCapabilities
-import android.net.NetworkRequest
 import android.net.wifi.SupplicantState
-import android.net.wifi.WifiManager
 import android.os.Build
-import com.wireguard.android.util.RootShell
-import com.zaneschepke.wireguardautotunnel.data.repository.SettingsRepository
-import com.zaneschepke.wireguardautotunnel.module.AppShell
-import com.zaneschepke.wireguardautotunnel.util.extensions.getCurrentWifiName
 import dagger.hilt.android.qualifiers.ApplicationContext
-import kotlinx.coroutines.channels.awaitClose
-import kotlinx.coroutines.flow.callbackFlow
-import kotlinx.coroutines.flow.catch
-import kotlinx.coroutines.flow.onStart
-import kotlinx.coroutines.flow.transform
-import kotlinx.coroutines.sync.Mutex
-import kotlinx.coroutines.sync.withLock
-import timber.log.Timber
 import javax.inject.Inject
-import javax.inject.Provider
 
 class WifiService
 @Inject
 constructor(
-	@ApplicationContext private val context: Context,
-	private val settingsRepository: SettingsRepository,
-	@AppShell private val rootShell: Provider<RootShell>,
-) : NetworkService {
+	@ApplicationContext context: Context,
+) :
+	BaseNetworkService<WifiService>(context, NetworkCapabilities.TRANSPORT_WIFI) {
 
-	val mutex = Mutex()
-
-	private var ssid: String? = null
-	private var available: Boolean = false
-
-	private val connectivityManager =
-		context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
-
-	override val status = callbackFlow {
-		val networkStatusCallback =
-			when (Build.VERSION.SDK_INT) {
-				in Build.VERSION_CODES.S..Int.MAX_VALUE -> {
-					object :
-						ConnectivityManager.NetworkCallback(
-							FLAG_INCLUDE_LOCATION_INFO,
-						) {
-						override fun onAvailable(network: Network) {
-							trySend(NetworkStatus.Available(network))
-						}
-
-						override fun onLost(network: Network) {
-							trySend(NetworkStatus.Unavailable())
-						}
-
-						override fun onCapabilitiesChanged(network: Network, networkCapabilities: NetworkCapabilities) {
-							trySend(
-								NetworkStatus.CapabilitiesChanged(
-									network,
-									networkCapabilities,
-								),
-							)
-						}
-					}
-				}
-
-				else -> {
-					object : ConnectivityManager.NetworkCallback() {
-						override fun onAvailable(network: Network) {
-							trySend(NetworkStatus.Available(network))
-						}
-
-						override fun onLost(network: Network) {
-							trySend(NetworkStatus.Unavailable())
-						}
-
-						override fun onCapabilitiesChanged(network: Network, networkCapabilities: NetworkCapabilities) {
-							trySend(
-								NetworkStatus.CapabilitiesChanged(
-									network,
-									networkCapabilities,
-								),
-							)
-						}
-					}
-				}
-			}
-		val request =
-			NetworkRequest.Builder()
-				.addTransportType(NetworkCapabilities.TRANSPORT_WIFI)
-				.addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
-				.addCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED)
-				.build()
-		connectivityManager.registerNetworkCallback(request, networkStatusCallback)
-
-		awaitClose { connectivityManager.unregisterNetworkCallback(networkStatusCallback) }
-	}.onStart {
-		// needed for services that are not yet available as it will impact later combine flows if we don't emit
-		emit(NetworkStatus.Unavailable())
-	}.catch {
-		Timber.e(it)
-		emit(NetworkStatus.Unavailable())
-	}.transform {
-		when (it) {
-			is NetworkStatus.Available -> mutex.withLock {
-				available = true
-			}
-			is NetworkStatus.CapabilitiesChanged -> mutex.withLock {
-				if (available) {
-					available = false
-					Timber.d("Getting SSID from capabilities")
-					ssid = getNetworkName(it.networkCapabilities)
-				}
-				emit(Status(true, ssid))
-			}
-			is NetworkStatus.Unavailable -> emit(Status(false, null))
-		}
-	}
-
-	private suspend fun getNetworkName(networkCapabilities: NetworkCapabilities): String? {
-		if (settingsRepository.getSettings().isWifiNameByShellEnabled) return rootShell.get().getCurrentWifiName()
+	override fun getNetworkName(networkCapabilities: NetworkCapabilities): String? {
 		var ssid = networkCapabilities.getWifiName()
 		if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.S) {
-			val wifiManager =
-				context.applicationContext.getSystemService(Context.WIFI_SERVICE) as WifiManager
-
-			@Suppress("DEPRECATION")
 			val info = wifiManager.connectionInfo
 			if (info.supplicantState === SupplicantState.COMPLETED) {
 				ssid = info.ssid
@@ -136,4 +24,9 @@ constructor(
 		}
 		return ssid?.trim('"')
 	}
+
+	override fun isNetworkSecure(): Boolean {
+		// TODO
+		return false
+	}
 }

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

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

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

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

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

@@ -1,19 +1,14 @@
 package com.zaneschepke.wireguardautotunnel.service.notification
 
-import android.Manifest
 import android.app.Notification
 import android.app.NotificationChannel
 import android.app.NotificationManager
 import android.app.PendingIntent
 import android.content.Context
 import android.content.Intent
-import android.content.pm.PackageManager
 import android.graphics.Color
-import androidx.core.app.ActivityCompat
 import androidx.core.app.NotificationCompat
-import androidx.core.app.NotificationManagerCompat
 import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.receiver.NotificationActionReceiver
 import com.zaneschepke.wireguardautotunnel.ui.MainActivity
 import dagger.hilt.android.qualifiers.ApplicationContext
 import javax.inject.Inject
@@ -21,123 +16,90 @@ import javax.inject.Inject
 class WireGuardNotification
 @Inject
 constructor(
-	@ApplicationContext override val context: Context,
-) : NotificationService {
+	@ApplicationContext private val context: Context,
+) :
+	NotificationService {
+	private val notificationManager =
+		context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
 
-	enum class NotificationChannels {
-		VPN,
-		AUTO_TUNNEL,
-	}
-
-	private val notificationManager = NotificationManagerCompat.from(context)
+	private val watcherBuilder: NotificationCompat.Builder =
+		NotificationCompat.Builder(
+			context,
+			context.getString(R.string.watcher_channel_id),
+		)
+	private val tunnelBuilder: NotificationCompat.Builder =
+		NotificationCompat.Builder(
+			context,
+			context.getString(R.string.vpn_channel_id),
+		)
 
 	override fun createNotification(
-		channel: NotificationChannels,
+		channelId: String,
+		channelName: String,
 		title: String,
-		actions: Collection<NotificationCompat.Action>,
+		action: PendingIntent?,
+		actionText: String?,
 		description: String,
 		showTimestamp: Boolean,
 		importance: Int,
+		vibration: Boolean,
 		onGoing: Boolean,
+		lights: Boolean,
 		onlyAlertOnce: Boolean,
 	): Notification {
-		notificationManager.createNotificationChannel(channel.asChannel())
-		return channel.asBuilder().apply {
-			actions.forEach {
-				addAction(it)
-			}
-			setContentTitle(title)
-			setContentIntent(
+		val channel =
+			NotificationChannel(
+				channelId,
+				channelName,
+				importance,
+			)
+				.let {
+					it.description = title
+					it.enableLights(lights)
+					it.lightColor = Color.RED
+					it.enableVibration(vibration)
+					it.vibrationPattern = longArrayOf(100, 200, 300)
+					it
+				}
+		notificationManager.createNotificationChannel(channel)
+		val pendingIntent: PendingIntent =
+			Intent(context, MainActivity::class.java).let { notificationIntent ->
 				PendingIntent.getActivity(
 					context,
 					0,
-					Intent(context, MainActivity::class.java),
+					notificationIntent,
 					PendingIntent.FLAG_IMMUTABLE,
-				),
-			)
-			setContentText(description)
-			setOnlyAlertOnce(onlyAlertOnce)
-			setOngoing(onGoing)
-			setPriority(NotificationCompat.PRIORITY_HIGH)
-			setShowWhen(showTimestamp)
-			setSmallIcon(R.drawable.ic_launcher)
-		}.build()
-	}
-
-	override fun createNotificationAction(notificationAction: NotificationAction): NotificationCompat.Action {
-		val pendingIntent = PendingIntent.getBroadcast(
-			context,
-			0,
-			Intent(context, NotificationActionReceiver::class.java).apply {
-				action = notificationAction.name
-			},
-			PendingIntent.FLAG_IMMUTABLE,
-		)
-		return NotificationCompat.Action.Builder(
-			R.drawable.ic_launcher,
-			notificationAction.title(context).uppercase(),
-			pendingIntent,
-		).build()
-	}
-
-	override fun remove(notificationId: Int) {
-		notificationManager.cancel(notificationId)
-	}
-
-	override fun show(notificationId: Int, notification: Notification) {
-		with(notificationManager) {
-			if (ActivityCompat.checkSelfPermission(context, Manifest.permission.POST_NOTIFICATIONS) != PackageManager.PERMISSION_GRANTED) {
-				return
-			}
-			notify(notificationId, notification)
-		}
-	}
-
-	private fun NotificationChannels.asBuilder(): NotificationCompat.Builder {
-		return when (this) {
-			NotificationChannels.AUTO_TUNNEL -> {
-				NotificationCompat.Builder(
-					context,
-					context.getString(R.string.auto_tunnel_channel_id),
 				)
 			}
-			NotificationChannels.VPN -> {
-				NotificationCompat.Builder(
-					context,
-					context.getString(R.string.vpn_channel_id),
-				)
-			}
-		}
-	}
 
-	private fun NotificationChannels.asChannel(): NotificationChannel {
-		return when (this) {
-			NotificationChannels.VPN -> {
-				NotificationChannel(
-					context.getString(R.string.vpn_channel_id),
-					context.getString(R.string.vpn_channel_name),
-					NotificationManager.IMPORTANCE_HIGH,
-				).apply {
-					description = context.getString(R.string.vpn_channel_description)
-					enableLights(true)
-					lightColor = Color.WHITE
-					enableVibration(false)
-					vibrationPattern = longArrayOf(100, 200, 300)
+		val builder =
+			when (channelId) {
+				context.getString(R.string.watcher_channel_id) -> watcherBuilder
+				context.getString(R.string.vpn_channel_id) -> tunnelBuilder
+				else -> {
+					NotificationCompat.Builder(
+						context,
+						channelId,
+					)
 				}
 			}
-			NotificationChannels.AUTO_TUNNEL -> {
-				NotificationChannel(
-					context.getString(R.string.auto_tunnel_channel_id),
-					context.getString(R.string.auto_tunnel_channel_name),
-					NotificationManager.IMPORTANCE_HIGH,
-				).apply {
-					description = context.getString(R.string.auto_tunnel_channel_description)
-					enableLights(true)
-					lightColor = Color.WHITE
-					enableVibration(false)
-					vibrationPattern = longArrayOf(100, 200, 300)
-				}
+
+		return builder.let {
+			if (action != null && actionText != null) {
+				it.addAction(
+					NotificationCompat.Action.Builder(0, actionText, action).build(),
+				)
+				it.setAutoCancel(true)
 			}
+			it.setContentTitle(title)
+				.setContentText(description)
+				.setOnlyAlertOnce(onlyAlertOnce)
+				.setContentIntent(pendingIntent)
+				.setOngoing(onGoing)
+				.setPriority(NotificationCompat.PRIORITY_HIGH)
+				.setShowWhen(showTimestamp)
+				.setSmallIcon(R.drawable.ic_launcher)
+				.build()
 		}
 	}
 }

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

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

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

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

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

@@ -4,8 +4,9 @@ import android.os.Bundle
 import androidx.activity.ComponentActivity
 import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
 import com.zaneschepke.wireguardautotunnel.module.ApplicationScope
+import com.zaneschepke.wireguardautotunnel.service.foreground.Action
+import com.zaneschepke.wireguardautotunnel.service.foreground.AutoTunnelService
 import com.zaneschepke.wireguardautotunnel.service.foreground.ServiceManager
-import com.zaneschepke.wireguardautotunnel.service.foreground.autotunnel.AutoTunnelService
 import com.zaneschepke.wireguardautotunnel.service.tunnel.TunnelService
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.CoroutineScope
@@ -46,7 +47,7 @@ class ShortcutsActivity : ComponentActivity() {
 						tunnelConfig?.let {
 							when (intent.action) {
 								Action.START.name -> tunnelService.get().startTunnel(it, true)
-								Action.STOP.name -> tunnelService.get().stopTunnel()
+								Action.STOP.name -> tunnelService.get().stopTunnel(it)
 								else -> Unit
 							}
 						}
@@ -63,11 +64,6 @@ class ShortcutsActivity : ComponentActivity() {
 		finish()
 	}
 
-	enum class Action {
-		START,
-		STOP,
-	}
-
 	companion object {
 		const val LEGACY_TUNNEL_SERVICE_NAME = "WireGuardTunnelService"
 		const val LEGACY_AUTO_TUNNEL_SERVICE_NAME = "WireGuardConnectivityWatcherService"

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

@@ -1,18 +1,24 @@
 package com.zaneschepke.wireguardautotunnel.service.tile
 
+import android.content.Intent
+import android.os.IBinder
 import android.service.quicksettings.Tile
 import android.service.quicksettings.TileService
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.LifecycleRegistry
+import androidx.lifecycle.lifecycleScope
 import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
 import com.zaneschepke.wireguardautotunnel.module.ApplicationScope
 import com.zaneschepke.wireguardautotunnel.service.foreground.ServiceManager
 import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
+import timber.log.Timber
 import javax.inject.Inject
 
 @AndroidEntryPoint
-class AutoTunnelControlTile : TileService() {
+class AutoTunnelControlTile : TileService(), LifecycleOwner {
 	@Inject
 	lateinit var appDataRepository: AppDataRepository
 
@@ -23,26 +29,32 @@ class AutoTunnelControlTile : TileService() {
 	@ApplicationScope
 	lateinit var applicationScope: CoroutineScope
 
+	private val lifecycleRegistry: LifecycleRegistry = LifecycleRegistry(this)
+
 	override fun onCreate() {
 		super.onCreate()
-		serviceManager.autoTunnelTile.complete(this)
+		lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_CREATE)
+	}
+
+	override fun onStopListening() {
+		lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_STOP)
 	}
 
 	override fun onDestroy() {
 		super.onDestroy()
-		serviceManager.autoTunnelTile = CompletableDeferred()
+		lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_DESTROY)
 	}
 
 	override fun onStartListening() {
 		super.onStartListening()
-		serviceManager.autoTunnelTile.complete(this)
-		applicationScope.launch {
+		lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_START)
+		lifecycleScope.launch {
 			if (appDataRepository.tunnels.getAll().isEmpty()) return@launch setUnavailable()
 			updateTileState()
 		}
 	}
 
-	fun updateTileState() {
+	private fun updateTileState() {
 		serviceManager.autoTunnelActive.value.let {
 			if (it) setActive() else setInactive()
 		}
@@ -51,7 +63,7 @@ class AutoTunnelControlTile : TileService() {
 	override fun onClick() {
 		super.onClick()
 		unlockAndRun {
-			applicationScope.launch {
+			lifecycleScope.launch {
 				if (serviceManager.autoTunnelActive.value) {
 					serviceManager.stopAutoTunnel()
 					setInactive()
@@ -83,4 +95,18 @@ class AutoTunnelControlTile : TileService() {
 			qsTile.updateTile()
 		}
 	}
+
+	/* This works around an annoying unsolved frameworks bug some people are hitting. */
+	override fun onBind(intent: Intent): IBinder? {
+		var ret: IBinder? = null
+		try {
+			ret = super.onBind(intent)
+		} catch (_: Throwable) {
+			Timber.e("Failed to bind to TunnelControlTile")
+		}
+		return ret
+	}
+
+	override val lifecycle: Lifecycle
+		get() = lifecycleRegistry
 }

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

@@ -1,22 +1,27 @@
 package com.zaneschepke.wireguardautotunnel.service.tile
 
+import android.content.Intent
 import android.os.Build
+import android.os.IBinder
 import android.service.quicksettings.Tile
 import android.service.quicksettings.TileService
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.LifecycleRegistry
+import androidx.lifecycle.lifecycleScope
 import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
 import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
 import com.zaneschepke.wireguardautotunnel.module.ApplicationScope
-import com.zaneschepke.wireguardautotunnel.service.foreground.ServiceManager
 import com.zaneschepke.wireguardautotunnel.service.tunnel.TunnelService
 import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
+import timber.log.Timber
 import javax.inject.Inject
 import javax.inject.Provider
 
 @AndroidEntryPoint
-class TunnelControlTile : TileService() {
+class TunnelControlTile : TileService(), LifecycleOwner {
 	@Inject
 	lateinit var appDataRepository: AppDataRepository
 
@@ -27,29 +32,33 @@ class TunnelControlTile : TileService() {
 	@ApplicationScope
 	lateinit var applicationScope: CoroutineScope
 
-	@Inject
-	lateinit var serviceManager: ServiceManager
+	private val lifecycleRegistry: LifecycleRegistry = LifecycleRegistry(this)
 
 	override fun onCreate() {
 		super.onCreate()
-		serviceManager.tunnelControlTile.complete(this)
+		lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_CREATE)
+	}
+
+	override fun onStopListening() {
+		lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_STOP)
 	}
 
 	override fun onDestroy() {
 		super.onDestroy()
-		serviceManager.tunnelControlTile = CompletableDeferred()
+		lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_DESTROY)
 	}
 
 	override fun onStartListening() {
 		super.onStartListening()
-		serviceManager.tunnelControlTile.complete(this)
-		applicationScope.launch {
+		lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_START)
+		Timber.d("Updating tile!")
+		lifecycleScope.launch {
 			if (appDataRepository.tunnels.getAll().isEmpty()) return@launch setUnavailable()
 			updateTileState()
 		}
 	}
 
-	fun updateTileState() = applicationScope.launch {
+	private suspend fun updateTileState() {
 		val lastActive = appDataRepository.getStartTunnelConfig()
 		lastActive?.let {
 			updateTile(it)
@@ -59,11 +68,11 @@ class TunnelControlTile : TileService() {
 	override fun onClick() {
 		super.onClick()
 		unlockAndRun {
-			applicationScope.launch {
+			lifecycleScope.launch {
 				val lastActive = appDataRepository.getStartTunnelConfig()
 				lastActive?.let { tunnel ->
 					if (tunnel.isActive) {
-						tunnelService.get().stopTunnel()
+						tunnelService.get().stopTunnel(tunnel)
 					} else {
 						tunnelService.get().startTunnel(tunnel, true)
 					}
@@ -116,4 +125,18 @@ class TunnelControlTile : TileService() {
 			}
 		}
 	}
+
+	/* This works around an annoying unsolved frameworks bug some people are hitting. */
+	override fun onBind(intent: Intent): IBinder? {
+		var ret: IBinder? = null
+		try {
+			ret = super.onBind(intent)
+		} catch (_: Throwable) {
+			Timber.e("Failed to bind to TunnelControlTile")
+		}
+		return ret
+	}
+
+	override val lifecycle: Lifecycle
+		get() = lifecycleRegistry
 }

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

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

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

@@ -5,16 +5,11 @@ import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
 import kotlinx.coroutines.flow.StateFlow
 
 interface TunnelService : Tunnel, org.amnezia.awg.backend.Tunnel {
+	suspend fun startTunnel(tunnelConfig: TunnelConfig, background: Boolean = false): Result<TunnelState>
 
-	suspend fun startTunnel(tunnelConfig: TunnelConfig?, background: Boolean = false)
+	suspend fun stopTunnel(tunnelConfig: TunnelConfig): Result<TunnelState>
 
-	suspend fun stopTunnel()
-
-	suspend fun bounceTunnel()
-
-	suspend fun getBackendState(): BackendState
-
-	suspend fun setBackendState(backendState: BackendState, allowedIps: Collection<String>)
+	suspend fun bounceTunnel(tunnelConfig: TunnelConfig): Result<TunnelState>
 
 	val vpnState: StateFlow<VpnState>
 
@@ -22,7 +17,7 @@ interface TunnelService : Tunnel, org.amnezia.awg.backend.Tunnel {
 
 	suspend fun getState(): TunnelState
 
-	fun cancelActiveTunnelJobs()
+	fun cancelStatsJob()
 
-	fun startActiveTunnelJobs()
+	fun startStatsJob()
 }

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

@@ -24,14 +24,6 @@ enum class TunnelState {
 		}
 	}
 
-	fun isDown(): Boolean {
-		return this == DOWN
-	}
-
-	fun isUp(): Boolean {
-		return this == UP
-	}
-
 	companion object {
 		fun from(state: Tunnel.State): TunnelState {
 			return when (state) {

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

@@ -2,7 +2,6 @@ package com.zaneschepke.wireguardautotunnel.service.tunnel
 
 import com.wireguard.android.backend.Backend
 import com.wireguard.android.backend.Tunnel.State
-import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
 import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
 import com.zaneschepke.wireguardautotunnel.data.repository.TunnelConfigRepository
@@ -10,26 +9,19 @@ import com.zaneschepke.wireguardautotunnel.module.ApplicationScope
 import com.zaneschepke.wireguardautotunnel.module.IoDispatcher
 import com.zaneschepke.wireguardautotunnel.module.Kernel
 import com.zaneschepke.wireguardautotunnel.service.foreground.ServiceManager
-import com.zaneschepke.wireguardautotunnel.service.notification.NotificationAction
-import com.zaneschepke.wireguardautotunnel.service.notification.NotificationService
-import com.zaneschepke.wireguardautotunnel.service.notification.NotificationService.Companion.VPN_NOTIFICATION_ID
-import com.zaneschepke.wireguardautotunnel.service.notification.WireGuardNotification
 import com.zaneschepke.wireguardautotunnel.service.tunnel.statistics.AmneziaStatistics
 import com.zaneschepke.wireguardautotunnel.service.tunnel.statistics.TunnelStatistics
 import com.zaneschepke.wireguardautotunnel.service.tunnel.statistics.WireGuardStatistics
-import com.zaneschepke.wireguardautotunnel.util.extensions.asAmBackendState
-import com.zaneschepke.wireguardautotunnel.util.extensions.asBackendState
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.flow.asStateFlow
-import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.sync.Mutex
-import kotlinx.coroutines.sync.withLock
 import kotlinx.coroutines.withContext
 import org.amnezia.awg.backend.Tunnel
 import timber.log.Timber
@@ -40,38 +32,29 @@ class WireGuardTunnel
 @Inject
 constructor(
 	private val amneziaBackend: Provider<org.amnezia.awg.backend.Backend>,
-	private val tunnelConfigRepository: TunnelConfigRepository,
+	tunnelConfigRepository: TunnelConfigRepository,
 	@Kernel private val kernelBackend: Provider<Backend>,
 	private val appDataRepository: AppDataRepository,
 	@ApplicationScope private val applicationScope: CoroutineScope,
 	@IoDispatcher private val ioDispatcher: CoroutineDispatcher,
 	private val serviceManager: ServiceManager,
-	private val notificationService: NotificationService,
 ) : TunnelService {
 
 	private val _vpnState = MutableStateFlow(VpnState())
-	override val vpnState: StateFlow<VpnState> = _vpnState.asStateFlow()
+	override val vpnState: StateFlow<VpnState> = _vpnState.combine(
+		tunnelConfigRepository.getTunnelConfigsFlow(),
+	) {
+			vpnState, tunnels ->
+		vpnState.copy(
+			tunnelConfig = tunnels.firstOrNull { it.id == vpnState.tunnelConfig?.id },
+		)
+	}.stateIn(applicationScope, SharingStarted.Lazily, VpnState())
 
 	private var statsJob: Job? = null
-	private var tunnelChangesJob: Job? = null
-
-	@get:Synchronized @set:Synchronized
-	private var isKernelBackend: Boolean? = null
-
-	private val tunnelControlMutex = Mutex()
-
-	init {
-		applicationScope.launch(ioDispatcher) {
-			appDataRepository.settings.getSettingsFlow().collect {
-				isKernelBackend = it.isKernelEnabled
-			}
-		}
-	}
 
 	private suspend fun backend(): Any {
-		val isKernelEnabled = isKernelBackend
-			?: appDataRepository.settings.getSettings().isKernelEnabled
-		if (isKernelEnabled) return kernelBackend.get()
+		val settings = appDataRepository.settings.getSettings()
+		if (settings.isKernelEnabled) return kernelBackend.get()
 		return amneziaBackend.get()
 	}
 
@@ -102,172 +85,120 @@ constructor(
 				else -> throw NotImplementedError()
 			}
 		}.onFailure {
-			// TODO add better error message to user, especially for kernel as exceptions contain no details
 			Timber.e(it)
 		}
 	}
 
-	private fun isTunnelAlreadyRunning(tunnelConfig: TunnelConfig): Boolean {
-		val isRunning = tunnelConfig == _vpnState.value.tunnelConfig && _vpnState.value.status.isUp()
-		if (isRunning) Timber.w("Tunnel already running")
-		return isRunning
-	}
-
-	override suspend fun startTunnel(tunnelConfig: TunnelConfig?, background: Boolean) {
-		withContext(ioDispatcher) {
-			if (tunnelConfig == null || isTunnelAlreadyRunning(tunnelConfig)) return@withContext
-			updateTunnelConfig(tunnelConfig) // need to update this here
-			withServiceActive {
-				onBeforeStart(background)
-				tunnelControlMutex.withLock {
-					setState(tunnelConfig, TunnelState.UP).onSuccess {
-						updateTunnelState(it, tunnelConfig)
-						onTunnelStart(tunnelConfig, background)
-					}
-				}.onFailure {
-					Timber.e(it)
-				}
+	override suspend fun startTunnel(tunnelConfig: TunnelConfig, background: Boolean): Result<TunnelState> {
+		return withContext(ioDispatcher) {
+			onBeforeStart(tunnelConfig, background)
+			setState(tunnelConfig, TunnelState.UP).onSuccess {
+				emitTunnelState(it)
+			}.onFailure {
+				Timber.e(it)
+				onStartFailed()
 			}
 		}
 	}
 
-	override suspend fun stopTunnel() {
-		withContext(ioDispatcher) {
-			if (_vpnState.value.status.isDown()) return@withContext
-			with(_vpnState.value) {
-				if (tunnelConfig == null) return@withContext
-				tunnelControlMutex.withLock {
-					setState(tunnelConfig, TunnelState.DOWN).onSuccess {
-						onTunnelStop(tunnelConfig)
-						updateTunnelState(it, null)
-					}.onFailure {
-						Timber.e(it)
-					}
-				}
+	override suspend fun stopTunnel(tunnelConfig: TunnelConfig): Result<TunnelState> {
+		return withContext(ioDispatcher) {
+			onBeforeStop(tunnelConfig)
+			setState(tunnelConfig, TunnelState.DOWN).onSuccess {
+				emitTunnelState(it)
+			}.onFailure {
+				Timber.e(it)
+				onStopFailed()
 			}
 		}
 	}
 
-	private suspend fun toggleTunnel(tunnelConfig: TunnelConfig) {
-		withContext(ioDispatcher) {
-			tunnelControlMutex.withLock {
-				setState(tunnelConfig, TunnelState.TOGGLE)
+	// use this when we just want to bounce tunnel and not change tunnelConfig active state
+	override suspend fun bounceTunnel(tunnelConfig: TunnelConfig): Result<TunnelState> {
+		toggleTunnel(tunnelConfig)
+		delay(VPN_RESTART_DELAY)
+		return toggleTunnel(tunnelConfig)
+	}
+
+	private suspend fun toggleTunnel(tunnelConfig: TunnelConfig): Result<TunnelState> {
+		return withContext(ioDispatcher) {
+			setState(tunnelConfig, TunnelState.TOGGLE).onSuccess {
+				emitTunnelState(it)
+				resetBackendStatistics()
+			}.onFailure {
+				Timber.e(it)
 			}
 		}
 	}
 
-	// utility to keep vpnService alive during rapid changes to prevent bad states
-	private suspend fun withServiceActive(callback: suspend () -> Unit) {
-		when (val backend = backend()) {
-			is org.amnezia.awg.backend.Backend -> {
-				val backendState = backend.backendState
-				if (backendState == org.amnezia.awg.backend.Backend.BackendState.INACTIVE) {
-					backend.setBackendState(org.amnezia.awg.backend.Backend.BackendState.SERVICE_ACTIVE, emptyList())
-				}
-				callback()
-			}
-			is Backend -> callback()
-		}
-	}
-
-	override suspend fun bounceTunnel() {
+	private suspend fun onStopFailed() {
 		_vpnState.value.tunnelConfig?.let {
-			withServiceActive {
-				toggleTunnel(it)
-				toggleTunnel(it)
-			}
+			appDataRepository.tunnels.save(it.copy(isActive = true))
 		}
 	}
 
-	override suspend fun getBackendState(): BackendState {
-		return when (val backend = backend()) {
-			is org.amnezia.awg.backend.Backend -> {
-				backend.backendState.asBackendState()
-			}
-			is Backend -> BackendState.SERVICE_ACTIVE
-			else -> BackendState.INACTIVE
+	private suspend fun onStartFailed() {
+		_vpnState.value.tunnelConfig?.let {
+			appDataRepository.tunnels.save(it.copy(isActive = false))
 		}
-	}
-
-	override suspend fun setBackendState(backendState: BackendState, allowedIps: Collection<String>) {
-		kotlin.runCatching {
-			when (val backend = backend()) {
-				is org.amnezia.awg.backend.Backend -> {
-					backend.setBackendState(backendState.asAmBackendState(), allowedIps)
-				}
-				is Backend -> {
-					// TODO not yet implemented
-					Timber.d("Kernel backend state not yet implemented")
-				}
-				else -> Unit
-			}
-		}
-	}
-
-	private suspend fun onBeforeStart(background: Boolean) {
-		with(_vpnState.value) {
-			if (status.isUp()) stopTunnel() else clearJobsAndStats()
-			if (isKernelBackend == true || background) serviceManager.startBackgroundService(tunnelConfig)
-		}
-	}
-
-	private suspend fun onTunnelStart(tunnelConfig: TunnelConfig, background: Boolean) {
-		startActiveTunnelJobs()
-		if (_vpnState.value.status.isUp()) {
-			appDataRepository.tunnels.save(tunnelConfig.copy(isActive = true))
-		}
-		if (isKernelBackend == false && !background) launchUserspaceTunnelNotification()
-	}
-
-	private fun launchUserspaceTunnelNotification() {
-		with(notificationService) {
-			val notification = createNotification(
-				WireGuardNotification.NotificationChannels.VPN,
-				title = "${context.getString(R.string.tunnel_running)} - ${_vpnState.value.tunnelConfig?.name}",
-				actions = listOf(
-					notificationService.createNotificationAction(NotificationAction.TUNNEL_OFF),
-				),
-			)
-			show(VPN_NOTIFICATION_ID, notification)
-		}
-	}
-
-	private suspend fun onTunnelStop(tunnelConfig: TunnelConfig) {
-		runCatching {
-			appDataRepository.tunnels.save(tunnelConfig.copy(isActive = false))
-			serviceManager.stopBackgroundService()
-			notificationService.remove(VPN_NOTIFICATION_ID)
-			clearJobsAndStats()
-		}
-	}
-
-	private fun clearJobsAndStats() {
-		cancelActiveTunnelJobs()
+		cancelStatsJob()
 		resetBackendStatistics()
 	}
 
-	private fun updateTunnelState(state: TunnelState, tunnelConfig: TunnelConfig?) {
-		_vpnState.update {
-			it.copy(status = state, tunnelConfig = tunnelConfig)
+	private suspend fun onBeforeStart(tunnelConfig: TunnelConfig, background: Boolean) {
+		if (_vpnState.value.status == TunnelState.UP &&
+			tunnelConfig != _vpnState.value.tunnelConfig
+		) {
+			vpnState.value.tunnelConfig?.let { stopTunnel(it) }
 		}
+		if (background) serviceManager.startBackgroundService()
+		resetBackendStatistics()
+		appDataRepository.tunnels.save(tunnelConfig.copy(isActive = true))
+		emitVpnStateConfig(tunnelConfig)
+		startStatsJob()
+		Timber.d("Updating start")
+		serviceManager.requestTunnelTileUpdate()
 	}
 
-	private fun updateTunnelConfig(tunnelConfig: TunnelConfig?) {
-		_vpnState.update {
-			it.copy(tunnelConfig = tunnelConfig)
-		}
+	private suspend fun onBeforeStop(tunnelConfig: TunnelConfig) {
+		cancelStatsJob()
+		resetBackendStatistics()
+		appDataRepository.tunnels.save(tunnelConfig.copy(isActive = false))
+		serviceManager.stopBackgroundService()
+		Timber.d("UPdating stop")
+		serviceManager.requestTunnelTileUpdate()
 	}
 
-	private fun updateBackendStatistics(statistics: TunnelStatistics) {
-		_vpnState.update {
-			it.copy(statistics = statistics)
-		}
+	private fun emitTunnelState(state: TunnelState) {
+		_vpnState.tryEmit(
+			_vpnState.value.copy(
+				status = state,
+			),
+		)
+	}
+
+	private fun emitBackendStatistics(statistics: TunnelStatistics) {
+		_vpnState.tryEmit(
+			_vpnState.value.copy(
+				statistics = statistics,
+			),
+		)
+	}
+
+	private fun emitVpnStateConfig(tunnelConfig: TunnelConfig) {
+		_vpnState.tryEmit(
+			_vpnState.value.copy(
+				tunnelConfig = tunnelConfig,
+			),
+		)
 	}
 
 	private fun resetBackendStatistics() {
-		_vpnState.update {
-			it.copy(statistics = null)
-		}
+		_vpnState.tryEmit(
+			_vpnState.value.copy(
+				statistics = null,
+			),
+		)
 	}
 
 	override suspend fun getState(): TunnelState {
@@ -278,14 +209,12 @@ constructor(
 		}
 	}
 
-	override fun cancelActiveTunnelJobs() {
+	override fun cancelStatsJob() {
 		statsJob?.cancel()
-		tunnelChangesJob?.cancel()
 	}
 
-	override fun startActiveTunnelJobs() {
+	override fun startStatsJob() {
 		statsJob = startTunnelStatisticsJob()
-		tunnelChangesJob = startTunnelConfigChangesJob()
 	}
 
 	override fun getName(): String {
@@ -297,51 +226,32 @@ constructor(
 		delay(STATS_START_DELAY)
 		while (true) {
 			when (backend) {
-				is Backend -> updateBackendStatistics(
+				is Backend -> emitBackendStatistics(
 					WireGuardStatistics(backend.getStatistics(this@WireGuardTunnel)),
 				)
-				is org.amnezia.awg.backend.Backend -> updateBackendStatistics(
-					AmneziaStatistics(
-						backend.getStatistics(this@WireGuardTunnel),
-					),
-				)
+				is org.amnezia.awg.backend.Backend -> {
+					emitBackendStatistics(
+						AmneziaStatistics(
+							backend.getStatistics(this@WireGuardTunnel),
+						),
+					)
+				}
 			}
 			delay(VPN_STATISTIC_CHECK_INTERVAL)
 		}
 	}
 
-	private fun startTunnelConfigChangesJob() = applicationScope.launch(ioDispatcher) {
-		tunnelConfigRepository.getTunnelConfigsFlow().collect {
-			with(_vpnState.value) {
-				if (status.isDown() || tunnelConfig == null) return@collect
-				val vpnConfigFromStorage = it.first { it.id == tunnelConfig.id }
-				val isRestartNeeded = vpnConfigFromStorage.wgQuick != tunnelConfig.wgQuick ||
-					vpnConfigFromStorage.amQuick != tunnelConfig.amQuick
-				updateTunnelConfig(vpnConfigFromStorage)
-				if (isRestartNeeded) {
-					Timber.d("Bouncing tunnel on config change")
-					bounceTunnel()
-				}
-			}
-		}
-	}
-
 	override fun onStateChange(newState: Tunnel.State) {
-		_vpnState.update {
-			it.copy(status = TunnelState.from(newState))
-		}
-		serviceManager.updateTunnelTile()
+		emitTunnelState(TunnelState.from(newState))
 	}
 
 	override fun onStateChange(state: State) {
-		_vpnState.update {
-			it.copy(status = TunnelState.from(state))
-		}
-		serviceManager.updateTunnelTile()
+		emitTunnelState(TunnelState.from(state))
 	}
 
 	companion object {
-		const val STATS_START_DELAY = 1_000L
+		const val STATS_START_DELAY = 5_000L
 		const val VPN_STATISTIC_CHECK_INTERVAL = 1_000L
+		const val VPN_RESTART_DELAY = 1_000L
 	}
 }

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

@@ -1,47 +1,26 @@
 package com.zaneschepke.wireguardautotunnel.ui
 
-import android.content.Context
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.wireguard.android.backend.WgQuickBackend
-import com.wireguard.android.util.RootShell
-import com.wireguard.config.Config
-import com.zaneschepke.logcatter.LogReader
-import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.WireGuardAutoTunnel
-import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
 import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
-import com.zaneschepke.wireguardautotunnel.module.AppShell
 import com.zaneschepke.wireguardautotunnel.module.IoDispatcher
 import com.zaneschepke.wireguardautotunnel.service.foreground.ServiceManager
-import com.zaneschepke.wireguardautotunnel.service.tunnel.BackendState
 import com.zaneschepke.wireguardautotunnel.service.tunnel.TunnelService
 import com.zaneschepke.wireguardautotunnel.service.tunnel.TunnelState
-import com.zaneschepke.wireguardautotunnel.ui.common.snackbar.SnackbarController
-import com.zaneschepke.wireguardautotunnel.ui.screens.tunneloptions.config.model.InterfaceProxy
-import com.zaneschepke.wireguardautotunnel.ui.screens.tunneloptions.config.model.PeerProxy
-import com.zaneschepke.wireguardautotunnel.ui.screens.tunneloptions.splittunnel.SplitTunnelApp
 import com.zaneschepke.wireguardautotunnel.util.Constants
-import com.zaneschepke.wireguardautotunnel.util.LocaleUtil
-import com.zaneschepke.wireguardautotunnel.util.StringValue
-import com.zaneschepke.wireguardautotunnel.util.extensions.getAllInternetCapablePackages
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharingStarted
-import kotlinx.coroutines.flow.asSharedFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.onCompletion
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.flow.takeWhile
-import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.plus
-import kotlinx.coroutines.withContext
-import timber.log.Timber
 import xyz.teamgravity.pin_lock_compose.PinManager
 import javax.inject.Inject
 import javax.inject.Provider
@@ -53,23 +32,9 @@ constructor(
 	private val appDataRepository: AppDataRepository,
 	private val tunnelService: Provider<TunnelService>,
 	@IoDispatcher private val ioDispatcher: CoroutineDispatcher,
-	@AppShell private val rootShell: Provider<RootShell>,
 	private val serviceManager: ServiceManager,
-	private val logReader: LogReader,
 ) : ViewModel() {
 
-	private val _popBackStack = MutableSharedFlow<Boolean>()
-	val popBackStack = _popBackStack.asSharedFlow()
-
-	private val _isAppReady = MutableStateFlow(false)
-	val isAppReady = _isAppReady.asStateFlow()
-
-	private val _configurationChange = MutableStateFlow(false)
-	val configurationChange = _configurationChange.asStateFlow()
-
-	private val _splitTunnelApps = MutableStateFlow<List<SplitTunnelApp>>(emptyList())
-	val splitTunnelApps = _splitTunnelApps.asStateFlow()
-
 	val uiState =
 		combine(
 			appDataRepository.settings.getSettingsFlow(),
@@ -91,13 +56,14 @@ constructor(
 			AppUiState(),
 		)
 
+	private val _isAppReady = MutableStateFlow<Boolean>(false)
+	val isAppReady = _isAppReady.asStateFlow()
+
 	init {
 		viewModelScope.launch {
 			initPin()
-			initServices()
-			launch {
-				initTunnel()
-			}
+			initAutoTunnel()
+			initTunnel()
 			appReadyCheck()
 		}
 	}
@@ -110,7 +76,7 @@ constructor(
 	}
 
 	private suspend fun initTunnel() {
-		if (tunnelService.get().getState() == TunnelState.UP) tunnelService.get().startActiveTunnelJobs()
+		if (tunnelService.get().getState() == TunnelState.UP) tunnelService.get().startStatsJob()
 		val activeTunnels = appDataRepository.tunnels.getActive()
 		if (activeTunnels.isNotEmpty() &&
 			tunnelService.get().getState() == TunnelState.DOWN
@@ -124,12 +90,9 @@ constructor(
 		if (isPinEnabled) PinManager.initialize(WireGuardAutoTunnel.instance)
 	}
 
-	private suspend fun initServices() {
-		withContext(ioDispatcher) {
-			val settings = appDataRepository.settings.getSettings()
-			handleVpnKillSwitchChange(settings.isVpnKillSwitchEnabled)
-			if (settings.isAutoTunnelEnabled) serviceManager.startAutoTunnel(false)
-		}
+	private suspend fun initAutoTunnel() {
+		val settings = appDataRepository.settings.getSettings()
+		if (settings.isAutoTunnelEnabled) serviceManager.startAutoTunnel(false)
 	}
 
 	fun onPinLockDisabled() = viewModelScope.launch(ioDispatcher) {
@@ -144,211 +107,4 @@ constructor(
 	fun setLocationDisclosureShown() = viewModelScope.launch {
 		appDataRepository.appState.setLocationDisclosureShown(true)
 	}
-
-	fun onToggleLocalLogging() = viewModelScope.launch(ioDispatcher) {
-		with(uiState.value.generalState) {
-			val toggledOn = !isLocalLogsEnabled
-			appDataRepository.appState.setLocalLogsEnabled(toggledOn)
-			if (!toggledOn) onLoggerStop()
-			_configurationChange.update {
-				true
-			}
-		}
-	}
-
-	private suspend fun onLoggerStop() {
-		logReader.deleteAndClearLogs()
-	}
-
-	fun onToggleAlwaysOnVPN() = viewModelScope.launch {
-		with(uiState.value.settings) {
-			appDataRepository.settings.save(
-				copy(
-					isAlwaysOnVpnEnabled = !isAlwaysOnVpnEnabled,
-				),
-			)
-		}
-	}
-
-	fun onLocaleChange(localeTag: String) = viewModelScope.launch {
-		appDataRepository.appState.setLocale(localeTag)
-		LocaleUtil.changeLocale(localeTag)
-		_configurationChange.update {
-			true
-		}
-	}
-
-	fun onToggleRestartAtBoot() = viewModelScope.launch {
-		with(uiState.value.settings) {
-			appDataRepository.settings.save(
-				copy(
-					isRestoreOnBootEnabled = !isRestoreOnBootEnabled,
-				),
-			)
-		}
-	}
-
-	fun onToggleVpnKillSwitch(enabled: Boolean) = viewModelScope.launch {
-		with(uiState.value.settings) {
-			appDataRepository.settings.save(
-				copy(
-					isVpnKillSwitchEnabled = enabled,
-					isLanOnKillSwitchEnabled = if (enabled) isLanOnKillSwitchEnabled else false,
-				),
-			)
-		}
-		handleVpnKillSwitchChange(enabled)
-	}
-
-	private suspend fun handleVpnKillSwitchChange(enabled: Boolean) {
-		withContext(ioDispatcher) {
-			if (enabled) {
-				Timber.d("Starting kill switch")
-				val allowedIps = if (appDataRepository.settings.getSettings().isLanOnKillSwitchEnabled) {
-					TunnelConfig.IPV4_PUBLIC_NETWORKS
-				} else {
-					emptySet()
-				}
-				tunnelService.get().setBackendState(BackendState.KILL_SWITCH_ACTIVE, allowedIps)
-			} else {
-				Timber.d("Sending shutdown of kill switch")
-				tunnelService.get().setBackendState(BackendState.SERVICE_ACTIVE, emptySet())
-			}
-		}
-	}
-
-	fun onToggleLanOnKillSwitch(enabled: Boolean) = viewModelScope.launch(ioDispatcher) {
-		appDataRepository.settings.save(
-			uiState.value.settings.copy(
-				isLanOnKillSwitchEnabled = enabled,
-			),
-		)
-		val allowedIps = if (enabled) TunnelConfig.IPV4_PUBLIC_NETWORKS else emptySet()
-		Timber.d("Setting allowedIps $allowedIps")
-		tunnelService.get().setBackendState(BackendState.KILL_SWITCH_ACTIVE, allowedIps)
-	}
-
-	fun onToggleShortcutsEnabled() = viewModelScope.launch {
-		with(uiState.value.settings) {
-			appDataRepository.settings.save(
-				copy(
-					isShortcutsEnabled = !isShortcutsEnabled,
-				),
-			)
-		}
-	}
-
-	private fun saveKernelMode(enabled: Boolean) = viewModelScope.launch {
-		with(uiState.value.settings) {
-			appDataRepository.settings.save(
-				this.copy(
-					isKernelEnabled = enabled,
-				),
-			)
-		}
-	}
-
-	fun onToggleKernelMode() = viewModelScope.launch {
-		with(uiState.value.settings) {
-			if (!isKernelEnabled) {
-				requestRoot().onSuccess {
-					if (!isKernelSupported()) return@onSuccess SnackbarController.showMessage(StringValue.StringResource(R.string.kernel_not_supported))
-					tunnelService.get().setBackendState(BackendState.INACTIVE, emptyList())
-					appDataRepository.settings.save(
-						copy(
-							isKernelEnabled = true,
-							isAmneziaEnabled = false,
-						),
-					)
-				}
-			} else {
-				saveKernelMode(enabled = false)
-			}
-		}
-	}
-
-	private suspend fun isKernelSupported(): Boolean {
-		return withContext(ioDispatcher) {
-			WgQuickBackend.hasKernelSupport()
-		}
-	}
-
-	suspend fun getEmitSplitTunnelApps(context: Context) {
-		withContext(ioDispatcher) {
-			val apps = context.getAllInternetCapablePackages().filter { it.applicationInfo != null }.map { pack ->
-				SplitTunnelApp(
-					context.packageManager.getApplicationIcon(pack.applicationInfo!!),
-					context.packageManager.getApplicationLabel(pack.applicationInfo!!).toString(),
-					pack.packageName,
-				)
-			}
-			_splitTunnelApps.emit(apps)
-		}
-	}
-
-	suspend fun requestRoot(): Result<Unit> {
-		return withContext(ioDispatcher) {
-			kotlin.runCatching {
-				rootShell.get().start()
-				SnackbarController.showMessage(StringValue.StringResource(R.string.root_accepted))
-			}.onFailure {
-				SnackbarController.showMessage(StringValue.StringResource(R.string.error_root_denied))
-			}
-		}
-	}
-
-	fun saveConfigChanges(config: TunnelConfig, peers: List<PeerProxy>? = null, `interface`: InterfaceProxy? = null) = viewModelScope.launch(
-		ioDispatcher,
-	) {
-		runCatching {
-			val amConfig = config.toAmConfig()
-			val wgConfig = config.toWgConfig()
-			rebuildConfigsAndSave(config, amConfig, wgConfig, peers, `interface`)
-			_popBackStack.emit(true)
-			SnackbarController.showMessage(StringValue.StringResource(R.string.config_changes_saved))
-		}.onFailure {
-			Timber.e(it)
-			SnackbarController.showMessage(
-				it.message?.let { message ->
-					(StringValue.DynamicString(message))
-				} ?: StringValue.StringResource(R.string.unknown_error),
-			)
-		}
-	}
-
-	fun cleanUpUninstalledApps(tunnelConfig: TunnelConfig, packages: List<String>) = viewModelScope.launch(ioDispatcher) {
-		runCatching {
-			val amConfig = tunnelConfig.toAmConfig()
-			val wgConfig = tunnelConfig.toWgConfig()
-			val proxy = InterfaceProxy.from(amConfig.`interface`)
-			if (proxy.includedApplications.isEmpty() && proxy.excludedApplications.isEmpty()) return@launch
-			if (proxy.includedApplications.retainAll(packages.toSet()) || proxy.excludedApplications.retainAll(packages.toSet())) {
-				Timber.i("Removing split tunnel package for app that no longer exists on the device")
-				rebuildConfigsAndSave(tunnelConfig, amConfig, wgConfig, `interface` = proxy)
-			}
-		}.onFailure {
-			Timber.e(it)
-		}
-	}
-
-	private suspend fun rebuildConfigsAndSave(
-		config: TunnelConfig,
-		amConfig: org.amnezia.awg.config.Config,
-		wgConfig: Config,
-		peers: List<PeerProxy>? = null,
-		`interface`: InterfaceProxy? = null,
-	) {
-		appDataRepository.tunnels.save(
-			config.copy(
-				wgQuick = Config.Builder().apply {
-					addPeers(peers?.map { it.toWgPeer() } ?: wgConfig.peers)
-					setInterface(`interface`?.toWgInterface() ?: wgConfig.`interface`)
-				}.build().toWgQuickString(true),
-				amQuick = org.amnezia.awg.config.Config.Builder().apply {
-					addPeers(peers?.map { it.toAmPeer() } ?: amConfig.peers)
-					setInterface(`interface`?.toAmInterface() ?: amConfig.`interface`)
-				}.build().toAwgQuickString(true),
-			),
-		)
-	}
 }

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

@@ -1,19 +1,14 @@
 package com.zaneschepke.wireguardautotunnel.ui
 
-import android.content.Intent
-import android.graphics.Color.TRANSPARENT
-import android.os.Build
+import android.content.Context
 import android.os.Bundle
-import androidx.activity.SystemBarStyle
 import androidx.activity.compose.setContent
-import androidx.activity.enableEdgeToEdge
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
 import androidx.compose.animation.core.tween
 import androidx.compose.animation.fadeIn
 import androidx.compose.animation.fadeOut
 import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.ExperimentalLayoutApi
 import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
@@ -29,7 +24,9 @@ import androidx.compose.material3.surfaceColorAtElevation
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
@@ -39,15 +36,19 @@ import androidx.navigation.compose.composable
 import androidx.navigation.compose.rememberNavController
 import androidx.navigation.toRoute
 import com.zaneschepke.wireguardautotunnel.R
+import com.zaneschepke.wireguardautotunnel.WireGuardAutoTunnel
+import com.zaneschepke.wireguardautotunnel.data.datastore.LocaleStorage
 import com.zaneschepke.wireguardautotunnel.data.repository.AppStateRepository
-import com.zaneschepke.wireguardautotunnel.service.shortcut.ShortcutManager
 import com.zaneschepke.wireguardautotunnel.service.tunnel.TunnelService
 import com.zaneschepke.wireguardautotunnel.ui.common.navigation.BottomNavBar
 import com.zaneschepke.wireguardautotunnel.ui.common.navigation.BottomNavItem
+import com.zaneschepke.wireguardautotunnel.ui.common.navigation.LocalFocusRequester
 import com.zaneschepke.wireguardautotunnel.ui.common.navigation.LocalNavController
 import com.zaneschepke.wireguardautotunnel.ui.common.snackbar.CustomSnackBar
 import com.zaneschepke.wireguardautotunnel.ui.common.snackbar.SnackbarControllerProvider
+import com.zaneschepke.wireguardautotunnel.ui.screens.config.ConfigScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.main.MainScreen
+import com.zaneschepke.wireguardautotunnel.ui.screens.options.OptionsScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.pinlock.PinLockScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.scanner.ScannerScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.settings.SettingsScreen
@@ -56,45 +57,37 @@ import com.zaneschepke.wireguardautotunnel.ui.screens.settings.appearance.displa
 import com.zaneschepke.wireguardautotunnel.ui.screens.settings.appearance.language.LanguageScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.settings.autotunnel.AutoTunnelScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.settings.disclosure.LocationDisclosureScreen
-import com.zaneschepke.wireguardautotunnel.ui.screens.settings.killswitch.KillSwitchScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.support.SupportScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.support.logs.LogsScreen
-import com.zaneschepke.wireguardautotunnel.ui.screens.tunneloptions.OptionsScreen
-import com.zaneschepke.wireguardautotunnel.ui.screens.tunneloptions.config.ConfigScreen
-import com.zaneschepke.wireguardautotunnel.ui.screens.tunneloptions.splittunnel.SplitTunnelScreen
-import com.zaneschepke.wireguardautotunnel.ui.screens.tunneloptions.tunnelautotunnel.TunnelAutoTunnelScreen
 import com.zaneschepke.wireguardautotunnel.ui.theme.WireguardAutoTunnelTheme
 import com.zaneschepke.wireguardautotunnel.util.Constants
+import com.zaneschepke.wireguardautotunnel.util.LocaleUtil
 import com.zaneschepke.wireguardautotunnel.util.extensions.requestAutoTunnelTileServiceUpdate
+import com.zaneschepke.wireguardautotunnel.util.extensions.requestTunnelTileServiceStateUpdate
 import dagger.hilt.android.AndroidEntryPoint
+import timber.log.Timber
 import javax.inject.Inject
-import kotlin.system.exitProcess
 
 @AndroidEntryPoint
 class MainActivity : AppCompatActivity() {
 
+	private val localeStorage: LocaleStorage by lazy {
+		(application as WireGuardAutoTunnel).localeStorage
+	}
+
+	private lateinit var oldPrefLocaleCode: String
+
 	@Inject
 	lateinit var appStateRepository: AppStateRepository
 
 	@Inject
 	lateinit var tunnelService: TunnelService
 
-	@Inject
-	lateinit var shortcutManager: ShortcutManager
+	private val viewModel by viewModels<AppViewModel>()
 
-	@OptIn(ExperimentalLayoutApi::class)
 	override fun onCreate(savedInstanceState: Bundle?) {
-		enableEdgeToEdge(
-			statusBarStyle = SystemBarStyle.auto(TRANSPARENT, TRANSPARENT),
-			navigationBarStyle = SystemBarStyle.auto(TRANSPARENT, TRANSPARENT),
-		)
-		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-			window.isNavigationBarContrastEnforced = false
-		}
 		super.onCreate(savedInstanceState)
 
-		val viewModel by viewModels<AppViewModel>()
-
 		installSplashScreen().apply {
 			setKeepOnScreenCondition {
 				!viewModel.isAppReady.value
@@ -102,21 +95,13 @@ class MainActivity : AppCompatActivity() {
 		}
 
 		setContent {
-			val appUiState by viewModel.uiState.collectAsStateWithLifecycle()
-			val configurationChange by viewModel.configurationChange.collectAsStateWithLifecycle()
+			val appUiState by viewModel.uiState.collectAsStateWithLifecycle(lifecycle = this.lifecycle)
 			val navController = rememberNavController()
+			val rootItemFocusRequester = remember { FocusRequester() }
 
-			LaunchedEffect(configurationChange) {
-				if (configurationChange) {
-					Intent(this@MainActivity, MainActivity::class.java).also {
-						startActivity(it)
-						exitProcess(0)
-					}
-				}
-			}
-
-			LaunchedEffect(Unit) {
-				viewModel.getEmitSplitTunnelApps(this@MainActivity)
+			LaunchedEffect(appUiState.tunnels) {
+				Timber.d("Updating launched")
+				requestTunnelTileServiceStateUpdate()
 			}
 
 			LaunchedEffect(appUiState.autoTunnelActive) {
@@ -127,126 +112,111 @@ class MainActivity : AppCompatActivity() {
 				LaunchedEffect(isAutoTunnelEnabled) {
 					this@MainActivity.requestAutoTunnelTileServiceUpdate()
 				}
-				LaunchedEffect(isShortcutsEnabled) {
-					if (!isShortcutsEnabled) return@LaunchedEffect shortcutManager.removeShortcuts()
-					shortcutManager.addShortcuts()
-				}
 			}
 
-			CompositionLocalProvider(LocalNavController provides navController) {
-				SnackbarControllerProvider { host ->
-					WireguardAutoTunnelTheme(theme = appUiState.generalState.theme) {
-						Scaffold(
-							contentWindowInsets = WindowInsets(0),
-							snackbarHost = {
-								SnackbarHost(host) { snackbarData: SnackbarData ->
-									CustomSnackBar(
-										snackbarData.visuals.message,
-										isRtl = false,
-										containerColor =
-										MaterialTheme.colorScheme.surfaceColorAtElevation(
-											2.dp,
+			CompositionLocalProvider(LocalFocusRequester provides rootItemFocusRequester) {
+				CompositionLocalProvider(LocalNavController provides navController) {
+					SnackbarControllerProvider { host ->
+						WireguardAutoTunnelTheme(theme = appUiState.generalState.theme) {
+							Scaffold(
+								contentWindowInsets = WindowInsets(0.dp),
+								snackbarHost = {
+									SnackbarHost(host) { snackbarData: SnackbarData ->
+										CustomSnackBar(
+											snackbarData.visuals.message,
+											isRtl = false,
+											containerColor =
+											MaterialTheme.colorScheme.surfaceColorAtElevation(
+												2.dp,
+											),
+										)
+									}
+								},
+								bottomBar = {
+									BottomNavBar(
+										navController,
+										listOf(
+											BottomNavItem(
+												name = stringResource(R.string.tunnels),
+												route = Route.Main,
+												icon = Icons.Rounded.Home,
+											),
+											BottomNavItem(
+												name = stringResource(R.string.settings),
+												route = Route.Settings,
+												icon = Icons.Rounded.Settings,
+											),
+											BottomNavItem(
+												name = stringResource(R.string.support),
+												route = Route.Support,
+												icon = Icons.Rounded.QuestionMark,
+											),
 										),
 									)
-								}
-							},
-							bottomBar = {
-								BottomNavBar(
-									navController,
-									listOf(
-										BottomNavItem(
-											name = stringResource(R.string.tunnels),
-											route = Route.Main,
-											icon = Icons.Rounded.Home,
-										),
-										BottomNavItem(
-											name = stringResource(R.string.settings),
-											route = Route.Settings,
-											icon = Icons.Rounded.Settings,
-										),
-										BottomNavItem(
-											name = stringResource(R.string.support),
-											route = Route.Support,
-											icon = Icons.Rounded.QuestionMark,
-										),
-									),
-								)
-							},
-						) { padding ->
-							Box(modifier = Modifier.fillMaxSize().padding(padding)) {
-								NavHost(
-									navController,
-									enterTransition = { fadeIn(tween(Constants.TRANSITION_ANIMATION_TIME)) },
-									exitTransition = { fadeOut(tween(Constants.TRANSITION_ANIMATION_TIME)) },
-									startDestination = (if (appUiState.generalState.isPinLockEnabled) Route.Lock else Route.Main),
-								) {
-									composable<Route.Main> {
-										MainScreen(
-											uiState = appUiState,
-										)
-									}
-									composable<Route.Settings> {
-										SettingsScreen(
-											appViewModel = viewModel,
-											uiState = appUiState,
-										)
-									}
-									composable<Route.LocationDisclosure> {
-										LocationDisclosureScreen(viewModel, appUiState)
-									}
-									composable<Route.AutoTunnel> {
-										AutoTunnelScreen(
-											appUiState,
-										)
-									}
-									composable<Route.Appearance> {
-										AppearanceScreen()
-									}
-									composable<Route.Language> {
-										LanguageScreen(appUiState, viewModel)
-									}
-									composable<Route.Display> {
-										DisplayScreen(appUiState)
-									}
-									composable<Route.Support> {
-										SupportScreen(appUiState, viewModel)
-									}
-									composable<Route.Logs> {
-										LogsScreen()
-									}
-									composable<Route.Config> {
-										val args = it.toRoute<Route.Config>()
-										ConfigScreen(
-											appUiState,
-											tunnelId = args.id,
-											appViewModel = viewModel,
-										)
-									}
-									composable<Route.TunnelOptions> {
-										val args = it.toRoute<Route.TunnelOptions>()
-										OptionsScreen(
-											tunnelId = args.id,
-											appUiState = appUiState,
-										)
-									}
-									composable<Route.Lock> {
-										PinLockScreen(
-											appViewModel = viewModel,
-										)
-									}
-									composable<Route.Scanner> {
-										ScannerScreen()
-									}
-									composable<Route.KillSwitch> {
-										KillSwitchScreen(appUiState, viewModel)
-									}
-									composable<Route.SplitTunnel> {
-										val args = it.toRoute<Route.SplitTunnel>()
-										SplitTunnelScreen(appUiState, args.id, viewModel)
-									}
-									composable<Route.TunnelAutoTunnel> {
-										val args = it.toRoute<Route.SplitTunnel>()
-										TunnelAutoTunnelScreen(appUiState, args.id)
+								},
+							) {
+								Box(modifier = Modifier.fillMaxSize().padding(it)) {
+									NavHost(
+										navController,
+										enterTransition = { fadeIn(tween(Constants.TRANSITION_ANIMATION_TIME)) },
+										exitTransition = { fadeOut(tween(Constants.TRANSITION_ANIMATION_TIME)) },
+										startDestination = (if (appUiState.generalState.isPinLockEnabled == true) Route.Lock else Route.Main),
+									) {
+										composable<Route.Main> {
+											MainScreen(
+												uiState = appUiState,
+											)
+										}
+										composable<Route.Settings> {
+											SettingsScreen(
+												appViewModel = viewModel,
+												uiState = appUiState,
+											)
+										}
+										composable<Route.LocationDisclosure> {
+											LocationDisclosureScreen(viewModel, appUiState)
+										}
+										composable<Route.AutoTunnel> {
+											AutoTunnelScreen(
+												appUiState,
+											)
+										}
+										composable<Route.Appearance> {
+											AppearanceScreen()
+										}
+										composable<Route.Language> {
+											LanguageScreen(localeStorage)
+										}
+										composable<Route.Display> {
+											DisplayScreen(appUiState)
+										}
+										composable<Route.Support> {
+											SupportScreen()
+										}
+										composable<Route.Logs> {
+											LogsScreen()
+										}
+										composable<Route.Config> {
+											val args = it.toRoute<Route.Config>()
+											ConfigScreen(
+												tunnelId = args.id,
+											)
+										}
+										composable<Route.Option> {
+											val args = it.toRoute<Route.Option>()
+											OptionsScreen(
+												tunnelId = args.id,
+												appUiState = appUiState,
+											)
+										}
+										composable<Route.Lock> {
+											PinLockScreen(
+												appViewModel = viewModel,
+											)
+										}
+										composable<Route.Scanner> {
+											ScannerScreen()
+										}
 									}
 								}
 							}
@@ -256,9 +226,24 @@ class MainActivity : AppCompatActivity() {
 			}
 		}
 	}
+
+	override fun attachBaseContext(newBase: Context) {
+		oldPrefLocaleCode = LocaleStorage(newBase).getPreferredLocale()
+		applyOverrideConfiguration(LocaleUtil.getLocalizedConfiguration(oldPrefLocaleCode))
+		super.attachBaseContext(newBase)
+	}
+
+	override fun onResume() {
+		val currentLocaleCode = LocaleStorage(this).getPreferredLocale()
+		if (oldPrefLocaleCode != currentLocaleCode) {
+			recreate() // locale is changed, restart the activity to update
+			oldPrefLocaleCode = currentLocaleCode
+		}
+		super.onResume()
+	}
+
 	override fun onDestroy() {
 		super.onDestroy()
-		// save battery by not polling stats while app is closed
-		tunnelService.cancelActiveTunnelJobs()
+		tunnelService.cancelStatsJob()
 	}
 }

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

@@ -21,9 +21,6 @@ sealed class Route {
 	@Serializable
 	data object Display : Route()
 
-	@Serializable
-	data object KillSwitch : Route()
-
 	@Serializable
 	data object Language : Route()
 
@@ -31,7 +28,7 @@ sealed class Route {
 	data object Main : Route()
 
 	@Serializable
-	data class TunnelOptions(
+	data class Option(
 		val id: Int,
 	) : Route()
 
@@ -46,16 +43,6 @@ sealed class Route {
 		val id: Int,
 	) : Route()
 
-	@Serializable
-	data class SplitTunnel(
-		val id: Int,
-	) : Route()
-
-	@Serializable
-	data class TunnelAutoTunnel(
-		val id: Int,
-	) : Route()
-
 	@Serializable
 	data object Logs : Route()
 }

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

@@ -55,13 +55,7 @@ fun ExpandingRowListItem(
 					modifier = Modifier.fillMaxWidth(13 / 20f),
 				) {
 					leading()
-					Text(
-						text,
-						maxLines = 1,
-						overflow = TextOverflow.Ellipsis,
-						style = MaterialTheme.typography.labelLarge,
-						color = MaterialTheme.colorScheme.onBackground,
-					)
+					Text(text, maxLines = 1, overflow = TextOverflow.Ellipsis, style = MaterialTheme.typography.labelLarge)
 				}
 				trailing()
 			}

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

@@ -2,22 +2,36 @@ package com.zaneschepke.wireguardautotunnel.ui.common
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.outlined.CheckBox
-import androidx.compose.material3.Icon
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+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.res.stringResource
+import androidx.compose.ui.unit.dp
+import com.zaneschepke.wireguardautotunnel.R
+import com.zaneschepke.wireguardautotunnel.util.extensions.scaledHeight
+import com.zaneschepke.wireguardautotunnel.util.extensions.scaledWidth
 
 @Composable
 fun SelectedLabel() {
 	Row(
-		modifier = Modifier.fillMaxSize(),
+		modifier = Modifier.fillMaxWidth(),
 		horizontalArrangement = Arrangement.End,
 		verticalAlignment = Alignment.CenterVertically,
 	) {
-		val icon = Icons.Outlined.CheckBox
-		Icon(icon, icon.name)
+		Text(
+			stringResource(id = R.string.selected),
+			modifier =
+			Modifier.padding(
+				horizontal = 24.dp.scaledWidth(),
+				vertical = 16.dp.scaledHeight(),
+			),
+			color =
+			MaterialTheme.colorScheme.onSurfaceVariant,
+			style = MaterialTheme.typography.labelSmall,
+		)
 	}
 }

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

@@ -25,6 +25,7 @@ import androidx.compose.ui.unit.dp
 import com.zaneschepke.wireguardautotunnel.ui.theme.iconSize
 import com.zaneschepke.wireguardautotunnel.util.extensions.scaledHeight
 import com.zaneschepke.wireguardautotunnel.util.extensions.scaledWidth
+import kotlin.let
 
 @androidx.compose.runtime.Composable
 fun IconSurfaceButton(title: String, onClick: () -> Unit, selected: Boolean, leadingIcon: ImageVector? = null, description: String? = null) {

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

@@ -1,8 +1,6 @@
 package com.zaneschepke.wireguardautotunnel.ui.common.button
 
-import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Switch
-import androidx.compose.material3.SwitchDefaults
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.scale
@@ -16,13 +14,5 @@ fun ScaledSwitch(checked: Boolean, onClick: (checked: Boolean) -> Unit, enabled:
 		{ onClick(it) },
 		modifier.scale((52.dp.scaledHeight() / 52.dp)),
 		enabled = enabled,
-		colors = SwitchDefaults.colors().copy(
-			checkedThumbColor = MaterialTheme.colorScheme.background,
-			checkedIconColor = MaterialTheme.colorScheme.background,
-			uncheckedTrackColor = MaterialTheme.colorScheme.surface,
-			uncheckedBorderColor = MaterialTheme.colorScheme.outline,
-			uncheckedThumbColor = MaterialTheme.colorScheme.outline,
-			uncheckedIconColor = MaterialTheme.colorScheme.outline,
-		),
 	)
 }

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

@@ -5,9 +5,7 @@ import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.Card
 import androidx.compose.material3.CardDefaults
@@ -19,10 +17,8 @@ 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.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import com.zaneschepke.wireguardautotunnel.util.extensions.scaledHeight
-import com.zaneschepke.wireguardautotunnel.util.extensions.scaledWidth
 
 @Composable
 fun SelectionItemButton(
@@ -34,8 +30,7 @@ fun SelectionItemButton(
 ) {
 	Card(
 		modifier =
-		Modifier
-			.clip(RoundedCornerShape(8.dp))
+		Modifier.clip(RoundedCornerShape(8.dp))
 			.clickable(
 				indication = if (ripple) ripple() else null,
 				interactionSource = remember { MutableInteractionSource() },
@@ -50,20 +45,15 @@ fun SelectionItemButton(
 		Row(
 			verticalAlignment = Alignment.CenterVertically,
 			horizontalArrangement = Arrangement.Start,
-			modifier = Modifier
-				.fillMaxSize()
-				.padding(end = 10.dp.scaledWidth()),
+			modifier = Modifier.fillMaxSize(),
 		) {
 			leading?.let {
 				it()
 			}
 			Text(
 				buttonText,
-				style = MaterialTheme.typography.labelMedium,
+				style = MaterialTheme.typography.bodyLarge,
 				color = MaterialTheme.colorScheme.onSurface,
-				modifier = Modifier.fillMaxWidth(3 / 4f),
-				maxLines = 2,
-				overflow = TextOverflow.Ellipsis,
 			)
 			trailing?.let {
 				it()

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

@@ -52,7 +52,6 @@ fun SurfaceSelectionGroupButton(items: List<SelectionItem>) {
 								icon,
 								icon.name,
 								modifier = Modifier.size(iconSize),
-								tint = MaterialTheme.colorScheme.onSurface,
 							)
 						}
 						Column(
@@ -81,7 +80,7 @@ fun SurfaceSelectionGroupButton(items: List<SelectionItem>) {
 					}
 				}
 			}
-			if (index + 1 != items.size) HorizontalDivider(color = MaterialTheme.colorScheme.outline.copy(0.30f))
+			if (index + 1 != items.size) HorizontalDivider(color = MaterialTheme.colorScheme.outlineVariant)
 		}
 	}
 }

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

@@ -3,7 +3,6 @@ package com.zaneschepke.wireguardautotunnel.ui.common.config
 import androidx.compose.foundation.interaction.MutableInteractionSource
 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
@@ -24,20 +23,19 @@ fun ConfigurationTextBox(
 		capitalization = KeyboardCapitalization.None,
 		imeAction = ImeAction.Done,
 	),
-	trailing: (@Composable () -> Unit)? = null,
+	trailing: @Composable () -> Unit = {},
 	interactionSource: MutableInteractionSource? = null,
 ) {
 	OutlinedTextField(
 		isError = isError,
-		textStyle = MaterialTheme.typography.labelLarge,
 		modifier = modifier,
 		value = value,
 		singleLine = true,
 		interactionSource = interactionSource,
 		onValueChange = { onValueChange(it) },
-		label = { Text(label, color = MaterialTheme.colorScheme.onSurface, style = MaterialTheme.typography.labelMedium) },
+		label = { Text(label) },
 		maxLines = 1,
-		placeholder = { Text(hint, color = MaterialTheme.colorScheme.outline, style = MaterialTheme.typography.labelLarge) },
+		placeholder = { Text(hint) },
 		keyboardOptions = keyboardOptions,
 		keyboardActions = keyboardActions,
 		trailingIcon = trailing,

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

@@ -4,12 +4,12 @@ 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.Switch
 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(
@@ -38,11 +38,11 @@ fun ConfigurationToggle(
 				),
 			softWrap = true,
 		)
-		ScaledSwitch(
+		Switch(
 			modifier = modifier,
 			enabled = enabled,
 			checked = checked,
-			onClick = { onCheckChanged(it) },
+			onCheckedChange = { onCheckChanged(it) },
 		)
 	}
 }

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

@@ -3,7 +3,6 @@ package com.zaneschepke.wireguardautotunnel.ui.common.config
 import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.interaction.collectIsFocusedAsState
 import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.text.KeyboardActions
 import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.material.icons.Icons
@@ -11,6 +10,7 @@ import androidx.compose.material.icons.outlined.Save
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.OutlinedTextField
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
@@ -20,11 +20,10 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalFocusManager
 import androidx.compose.ui.platform.LocalSoftwareKeyboardController
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.text.input.KeyboardCapitalization
-import androidx.compose.ui.unit.dp
-import com.zaneschepke.wireguardautotunnel.ui.common.textbox.CustomTextField
-import com.zaneschepke.wireguardautotunnel.util.extensions.scaledWidth
+import com.zaneschepke.wireguardautotunnel.R
 
 @Composable
 fun SubmitConfigurationTextBox(
@@ -45,22 +44,17 @@ fun SubmitConfigurationTextBox(
 
 	var stateValue by remember { mutableStateOf(value ?: "") }
 
-	CustomTextField(
+	OutlinedTextField(
 		isError = isErrorValue(stateValue),
-		textStyle = MaterialTheme.typography.bodySmall,
+		modifier = Modifier
+			.fillMaxWidth(),
 		value = stateValue,
-		onValueChange = { stateValue = it },
-		interactionSource = interactionSource,
-		label = { Text(label) },
-		containerColor = MaterialTheme.colorScheme.surface,
-		placeholder = { Text(hint, style = MaterialTheme.typography.bodySmall) },
-		modifier =
-		Modifier
-			.padding(
-				top = 5.dp,
-				bottom = 10.dp,
-			).fillMaxWidth().padding(end = 16.dp.scaledWidth()),
 		singleLine = true,
+		interactionSource = interactionSource,
+		onValueChange = { stateValue = it },
+		label = { Text(label) },
+		maxLines = 1,
+		placeholder = { Text(hint) },
 		keyboardOptions = keyboardOptions,
 		keyboardActions = KeyboardActions(
 			onDone = {
@@ -68,17 +62,16 @@ fun SubmitConfigurationTextBox(
 				keyboardController?.hide()
 			},
 		),
-		trailing = {
+		trailingIcon = {
 			if (!isErrorValue(stateValue) && isFocused) {
 				IconButton(onClick = {
 					onSubmit(stateValue)
 					keyboardController?.hide()
 					focusManager.clearFocus()
 				}) {
-					val icon = Icons.Outlined.Save
 					Icon(
-						imageVector = icon,
-						contentDescription = icon.name,
+						imageVector = Icons.Outlined.Save,
+						contentDescription = stringResource(R.string.save_changes),
 						tint = MaterialTheme.colorScheme.primary,
 					)
 				}

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

@@ -16,7 +16,6 @@ fun GroupLabel(title: String) {
 		Text(
 			title,
 			style = MaterialTheme.typography.titleMedium,
-			color = MaterialTheme.colorScheme.onBackground,
 		)
 	}
 }

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

@@ -4,14 +4,12 @@ import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.NavigationBar
 import androidx.compose.material3.NavigationBarItem
-import androidx.compose.material3.NavigationBarItemDefaults
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
-import androidx.compose.ui.graphics.Color
 import androidx.navigation.NavController
 import androidx.navigation.NavGraph.Companion.findStartDestination
 import androidx.navigation.compose.currentBackStackEntryAsState
@@ -59,13 +57,6 @@ fun BottomNavBar(navController: NavController, bottomNavItems: List<BottomNavIte
 							contentDescription = "${item.name} Icon",
 						)
 					},
-					colors = NavigationBarItemDefaults.colors().copy(
-						selectedIndicatorColor = Color.Transparent,
-						selectedIconColor = MaterialTheme.colorScheme.primary,
-						selectedTextColor = MaterialTheme.colorScheme.primary,
-						unselectedTextColor = MaterialTheme.colorScheme.outline.copy(alpha = 0.55f),
-						unselectedIconColor = MaterialTheme.colorScheme.outline.copy(alpha = 0.55f),
-					),
 				)
 			}
 		}

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

@@ -1,8 +1,11 @@
 package com.zaneschepke.wireguardautotunnel.ui.common.navigation
 
 import androidx.compose.runtime.compositionLocalOf
+import androidx.compose.ui.focus.FocusRequester
 import androidx.navigation.NavHostController
 
 val LocalNavController = compositionLocalOf<NavHostController> {
 	error("NavController was not provided")
 }
+
+val LocalFocusRequester = compositionLocalOf<FocusRequester> { error("FocusRequester is not provided") }

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/common/permission/vpn/withVpnPermission.kt

@@ -1,38 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.ui.common.permission.vpn
-
-import android.net.VpnService
-import androidx.activity.compose.rememberLauncherForActivityResult
-import androidx.activity.result.contract.ActivityResultContracts
-import androidx.appcompat.app.AppCompatActivity.RESULT_OK
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.platform.LocalContext
-
-@Composable
-inline fun <T> withVpnPermission(crossinline onSuccess: (t: T) -> Unit): (t: T) -> Unit {
-	val context = LocalContext.current
-
-	var showVpnPermissionDialog by remember { mutableStateOf(false) }
-
-	val vpnActivity =
-		rememberLauncherForActivityResult(
-			ActivityResultContracts.StartActivityForResult(),
-			onResult = {
-				if (it.resultCode != RESULT_OK) showVpnPermissionDialog = true
-			},
-		)
-
-	VpnDeniedDialog(showVpnPermissionDialog, onDismiss = { showVpnPermissionDialog = false })
-
-	return {
-		val intent = VpnService.prepare(context)
-		if (intent != null) {
-			vpnActivity.launch(intent)
-		} else {
-			onSuccess(it)
-		}
-	}
-}

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

@@ -1,35 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.ui.common.permission
-
-import android.content.Intent
-import android.net.Uri
-import android.provider.Settings
-import androidx.activity.compose.rememberLauncherForActivityResult
-import androidx.activity.result.ActivityResult
-import androidx.activity.result.contract.ActivityResultContracts
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.platform.LocalContext
-import com.zaneschepke.wireguardautotunnel.util.extensions.isBatteryOptimizationsDisabled
-
-@Composable
-inline fun withIgnoreBatteryOpt(ignore: Boolean, crossinline callback: () -> Unit): () -> Unit {
-	val context = LocalContext.current
-	val batteryActivity =
-		rememberLauncherForActivityResult(
-			ActivityResultContracts.StartActivityForResult(),
-		) { result: ActivityResult ->
-			// we only ask once
-			callback()
-		}
-	return {
-		if (ignore || context.isBatteryOptimizationsDisabled()) {
-			callback()
-		} else {
-			batteryActivity.launch(
-				Intent().apply {
-					action = Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS
-					data = Uri.parse("package:${context.packageName}")
-				},
-			)
-		}
-	}
-}

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

@@ -10,6 +10,7 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.OutlinedTextFieldDefaults
 import androidx.compose.material3.TextFieldDefaults
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.SolidColor
@@ -28,16 +29,16 @@ fun CustomTextField(
 	onValueChange: (value: String) -> Unit = {},
 	singleLine: Boolean = false,
 	placeholder: @Composable (() -> Unit)? = null,
-	keyboardOptions: KeyboardOptions = KeyboardOptions(),
-	keyboardActions: KeyboardActions = KeyboardActions(),
+	keyboardOptions: KeyboardOptions,
+	keyboardActions: KeyboardActions,
 	supportingText: @Composable (() -> Unit)? = null,
 	leading: @Composable (() -> Unit)? = null,
 	trailing: @Composable (() -> Unit)? = null,
 	isError: Boolean = false,
 	readOnly: Boolean = false,
 	enabled: Boolean = true,
-	interactionSource: MutableInteractionSource,
 ) {
+	val interactionSource = remember { MutableInteractionSource() }
 	val space = " "
 	BasicTextField(
 		value = value,

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/config/ConfigScreen.kt

@@ -0,0 +1,601 @@
+package com.zaneschepke.wireguardautotunnel.ui.screens.config
+
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.focusGroup
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.IntrinsicSize
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.text.KeyboardActions
+import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.rounded.ContentCopy
+import androidx.compose.material.icons.rounded.Delete
+import androidx.compose.material.icons.rounded.Refresh
+import androidx.compose.material.icons.rounded.Save
+import androidx.compose.material3.FabPosition
+import androidx.compose.material3.FloatingActionButton
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.OutlinedTextField
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.derivedStateOf
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.focus.focusRequester
+import androidx.compose.ui.platform.ClipboardManager
+import androidx.compose.ui.platform.LocalClipboardManager
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalSoftwareKeyboardController
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.text.buildAnnotatedString
+import androidx.compose.ui.text.input.ImeAction
+import androidx.compose.ui.text.input.PasswordVisualTransformation
+import androidx.compose.ui.text.input.VisualTransformation
+import androidx.compose.ui.unit.dp
+import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import com.zaneschepke.wireguardautotunnel.R
+import com.zaneschepke.wireguardautotunnel.ui.Route
+import com.zaneschepke.wireguardautotunnel.ui.common.config.ConfigurationTextBox
+import com.zaneschepke.wireguardautotunnel.ui.common.config.ConfigurationToggle
+import com.zaneschepke.wireguardautotunnel.ui.common.navigation.LocalNavController
+import com.zaneschepke.wireguardautotunnel.ui.common.navigation.TopNavBar
+import com.zaneschepke.wireguardautotunnel.ui.common.prompt.AuthorizationPrompt
+import com.zaneschepke.wireguardautotunnel.ui.common.snackbar.SnackbarController
+import com.zaneschepke.wireguardautotunnel.ui.common.text.SectionTitle
+import com.zaneschepke.wireguardautotunnel.ui.screens.config.components.ApplicationSelectionDialog
+import com.zaneschepke.wireguardautotunnel.ui.screens.main.ConfigType
+import com.zaneschepke.wireguardautotunnel.util.Constants
+import com.zaneschepke.wireguardautotunnel.util.extensions.isRunningOnTv
+import com.zaneschepke.wireguardautotunnel.util.extensions.scaledHeight
+import kotlinx.coroutines.delay
+
+@Composable
+fun ConfigScreen(tunnelId: Int) {
+	val viewModel = hiltViewModel<ConfigViewModel, ConfigViewModel.ConfigViewModelFactory> { factory ->
+		factory.create(tunnelId)
+	}
+
+	val context = LocalContext.current
+	val snackbar = SnackbarController.current
+	val clipboardManager: ClipboardManager = LocalClipboardManager.current
+	val keyboardController = LocalSoftwareKeyboardController.current
+	val navController = LocalNavController.current
+
+	var showApplicationsDialog by remember { mutableStateOf(false) }
+	var showAuthPrompt by remember { mutableStateOf(false) }
+	var isAuthenticated by remember { mutableStateOf(false) }
+
+	val uiState by viewModel.uiState.collectAsStateWithLifecycle()
+	var configType by remember { mutableStateOf<ConfigType?>(null) }
+	val derivedConfigType = remember {
+		derivedStateOf<ConfigType> {
+			configType ?: if (!uiState.hasAmneziaProperties()) ConfigType.WIREGUARD else ConfigType.AMNEZIA
+		}
+	}
+	val saved by viewModel.saved.collectAsStateWithLifecycle(null)
+
+	LaunchedEffect(saved) {
+		if (saved == true) {
+			navController.navigate(Route.Main)
+		}
+	}
+
+	LaunchedEffect(Unit) {
+		delay(2_000L)
+		viewModel.cleanUpUninstalledApps()
+	}
+
+	val keyboardActions = KeyboardActions(onDone = { keyboardController?.hide() })
+	val keyboardOptions = KeyboardOptions(imeAction = ImeAction.Done)
+
+	val fillMaxHeight = .85f
+	val fillMaxWidth = .85f
+	val screenPadding = 5.dp
+
+	val applicationButtonText =
+		buildAnnotatedString {
+			append(stringResource(id = R.string.tunneling_apps))
+			append(": ")
+			if (uiState.isAllApplicationsEnabled) {
+				append(stringResource(id = R.string.all))
+			} else {
+				append("${uiState.checkedPackageNames.size} ")
+				(
+					if (uiState.include) {
+						append(stringResource(id = R.string.included))
+					} else {
+						append(
+							stringResource(id = R.string.excluded),
+						)
+					}
+					)
+			}
+		}
+
+	if (showAuthPrompt) {
+		AuthorizationPrompt(
+			onSuccess = {
+				showAuthPrompt = false
+				isAuthenticated = true
+			},
+			onError = {
+				showAuthPrompt = false
+				snackbar.showMessage(
+					context.getString(R.string.error_authentication_failed),
+				)
+			},
+			onFailure = {
+				showAuthPrompt = false
+				snackbar.showMessage(
+					context.getString(R.string.error_authorization_failed),
+				)
+			},
+		)
+	}
+
+	if (showApplicationsDialog) {
+		ApplicationSelectionDialog(viewModel, uiState) {
+			showApplicationsDialog = false
+		}
+	}
+
+	Scaffold(
+		topBar = {
+			TopNavBar(stringResource(R.string.edit_tunnel))
+		},
+		floatingActionButtonPosition = FabPosition.End,
+		floatingActionButton = {
+			FloatingActionButton(
+				onClick = {
+					viewModel.onSaveAllChanges()
+				},
+				containerColor = MaterialTheme.colorScheme.primary,
+				shape = RoundedCornerShape(16.dp),
+			) {
+				Icon(
+					imageVector = Icons.Rounded.Save,
+					contentDescription = stringResource(id = R.string.save_changes),
+					tint = MaterialTheme.colorScheme.background,
+				)
+			}
+		},
+	) {
+		Column(Modifier.padding(it)) {
+			Column(
+				horizontalAlignment = Alignment.CenterHorizontally,
+				verticalArrangement = Arrangement.Top,
+				modifier =
+				Modifier
+					.verticalScroll(rememberScrollState())
+					.weight(1f, true)
+					.fillMaxSize(),
+			) {
+				Surface(
+					tonalElevation = 2.dp,
+					shadowElevation = 2.dp,
+					shape = RoundedCornerShape(12.dp),
+					color = MaterialTheme.colorScheme.surface,
+					modifier =
+					(
+						if (context.isRunningOnTv()) {
+							Modifier
+								.fillMaxHeight(fillMaxHeight)
+								.fillMaxWidth(fillMaxWidth)
+						} else {
+							Modifier.fillMaxWidth(fillMaxWidth)
+						}
+						)
+						.padding(bottom = 10.dp.scaledHeight()).padding(top = 24.dp.scaledHeight()),
+				) {
+					Column(
+						horizontalAlignment = Alignment.Start,
+						verticalArrangement = Arrangement.Top,
+						modifier =
+						Modifier
+							.padding(15.dp)
+							.focusGroup(),
+					) {
+						SectionTitle(
+							stringResource(R.string.interface_),
+							padding = screenPadding,
+						)
+						ConfigurationToggle(
+							stringResource(id = R.string.show_amnezia_properties),
+							checked = derivedConfigType.value == ConfigType.AMNEZIA,
+							onCheckChanged = { configType = if (it) ConfigType.AMNEZIA else ConfigType.WIREGUARD },
+						)
+						ConfigurationTextBox(
+							value = uiState.tunnelName,
+							onValueChange = viewModel::onTunnelNameChange,
+							keyboardActions = keyboardActions,
+							label = stringResource(R.string.name),
+							hint = stringResource(R.string.tunnel_name).lowercase(),
+							modifier =
+							Modifier
+								.fillMaxWidth(),
+						)
+						OutlinedTextField(
+							modifier =
+							Modifier
+								.fillMaxWidth()
+								.clickable { showAuthPrompt = true },
+							value = uiState.interfaceProxy.privateKey,
+							visualTransformation =
+							if ((tunnelId == Constants.MANUAL_TUNNEL_CONFIG_ID.toInt()) || isAuthenticated) {
+								VisualTransformation.None
+							} else {
+								PasswordVisualTransformation()
+							},
+							enabled = (tunnelId == Constants.MANUAL_TUNNEL_CONFIG_ID.toInt()) || isAuthenticated,
+							onValueChange = { value -> viewModel.onPrivateKeyChange(value) },
+							trailingIcon = {
+								IconButton(
+									modifier = Modifier.focusRequester(FocusRequester.Default),
+									onClick = { viewModel.generateKeyPair() },
+								) {
+									Icon(
+										Icons.Rounded.Refresh,
+										stringResource(R.string.rotate_keys),
+										tint = MaterialTheme.colorScheme.onSurface,
+									)
+								}
+							},
+							label = { Text(stringResource(R.string.private_key)) },
+							singleLine = true,
+							placeholder = { Text(stringResource(R.string.base64_key)) },
+							keyboardOptions = keyboardOptions,
+							keyboardActions = keyboardActions,
+						)
+						OutlinedTextField(
+							modifier =
+							Modifier
+								.fillMaxWidth()
+								.focusRequester(FocusRequester.Default),
+							value = uiState.interfaceProxy.publicKey,
+							enabled = false,
+							onValueChange = {},
+							trailingIcon = {
+								IconButton(
+									modifier = Modifier.focusRequester(FocusRequester.Default),
+									onClick = {
+										clipboardManager.setText(
+											AnnotatedString(uiState.interfaceProxy.publicKey),
+										)
+									},
+								) {
+									Icon(
+										Icons.Rounded.ContentCopy,
+										stringResource(R.string.copy_public_key),
+										tint = MaterialTheme.colorScheme.onSurface,
+									)
+								}
+							},
+							label = { Text(stringResource(R.string.public_key)) },
+							singleLine = true,
+							placeholder = { Text(stringResource(R.string.base64_key)) },
+							keyboardOptions = keyboardOptions,
+							keyboardActions = keyboardActions,
+						)
+						ConfigurationTextBox(
+							value = uiState.interfaceProxy.addresses,
+							onValueChange = viewModel::onAddressesChanged,
+							keyboardActions = keyboardActions,
+							label = stringResource(R.string.addresses),
+							hint = stringResource(R.string.comma_separated_list),
+							modifier =
+							Modifier
+								.fillMaxWidth()
+								.padding(end = 5.dp),
+						)
+						ConfigurationTextBox(
+							value = uiState.interfaceProxy.listenPort,
+							onValueChange = viewModel::onListenPortChanged,
+							keyboardActions = keyboardActions,
+							label = stringResource(R.string.listen_port),
+							hint = stringResource(R.string.random),
+							modifier = Modifier.fillMaxWidth(),
+						)
+						Row(modifier = Modifier.fillMaxWidth()) {
+							ConfigurationTextBox(
+								value = uiState.interfaceProxy.dnsServers,
+								onValueChange = viewModel::onDnsServersChanged,
+								keyboardActions = keyboardActions,
+								label = stringResource(R.string.dns_servers),
+								hint = stringResource(R.string.comma_separated_list),
+								modifier =
+								Modifier
+									.fillMaxWidth(3 / 5f)
+									.padding(end = 5.dp),
+							)
+							ConfigurationTextBox(
+								value = uiState.interfaceProxy.mtu,
+								onValueChange = viewModel::onMtuChanged,
+								keyboardActions = keyboardActions,
+								label = stringResource(R.string.mtu),
+								hint = stringResource(R.string.auto),
+								modifier = Modifier.width(IntrinsicSize.Min),
+							)
+						}
+						if (derivedConfigType.value == ConfigType.AMNEZIA) {
+							ConfigurationTextBox(
+								value = uiState.interfaceProxy.junkPacketCount,
+								onValueChange = viewModel::onJunkPacketCountChanged,
+								keyboardActions = keyboardActions,
+								label = stringResource(R.string.junk_packet_count),
+								hint = stringResource(R.string.junk_packet_count).lowercase(),
+								modifier =
+								Modifier
+									.fillMaxWidth(),
+							)
+							ConfigurationTextBox(
+								value = uiState.interfaceProxy.junkPacketMinSize,
+								onValueChange = viewModel::onJunkPacketMinSizeChanged,
+								keyboardActions = keyboardActions,
+								label = stringResource(R.string.junk_packet_minimum_size),
+								hint =
+								stringResource(
+									R.string.junk_packet_minimum_size,
+								).lowercase(),
+								modifier =
+								Modifier
+									.fillMaxWidth(),
+							)
+							ConfigurationTextBox(
+								value = uiState.interfaceProxy.junkPacketMaxSize,
+								onValueChange = viewModel::onJunkPacketMaxSizeChanged,
+								keyboardActions = keyboardActions,
+								label = stringResource(R.string.junk_packet_maximum_size),
+								hint =
+								stringResource(
+									R.string.junk_packet_maximum_size,
+								).lowercase(),
+								modifier =
+								Modifier
+									.fillMaxWidth(),
+							)
+							ConfigurationTextBox(
+								value = uiState.interfaceProxy.initPacketJunkSize,
+								onValueChange = viewModel::onInitPacketJunkSizeChanged,
+								keyboardActions = keyboardActions,
+								label = stringResource(R.string.init_packet_junk_size),
+								hint = stringResource(R.string.init_packet_junk_size).lowercase(),
+								modifier =
+								Modifier
+									.fillMaxWidth(),
+							)
+							ConfigurationTextBox(
+								value = uiState.interfaceProxy.responsePacketJunkSize,
+								onValueChange = viewModel::onResponsePacketJunkSize,
+								keyboardActions = keyboardActions,
+								label = stringResource(R.string.response_packet_junk_size),
+								hint =
+								stringResource(
+									R.string.response_packet_junk_size,
+								).lowercase(),
+								modifier =
+								Modifier
+									.fillMaxWidth(),
+							)
+							ConfigurationTextBox(
+								value = uiState.interfaceProxy.initPacketMagicHeader,
+								onValueChange = viewModel::onInitPacketMagicHeader,
+								keyboardActions = keyboardActions,
+								label = stringResource(R.string.init_packet_magic_header),
+								hint =
+								stringResource(
+									R.string.init_packet_magic_header,
+								).lowercase(),
+								modifier =
+								Modifier
+									.fillMaxWidth(),
+							)
+							ConfigurationTextBox(
+								value = uiState.interfaceProxy.responsePacketMagicHeader,
+								onValueChange = viewModel::onResponsePacketMagicHeader,
+								keyboardActions = keyboardActions,
+								label = stringResource(R.string.response_packet_magic_header),
+								hint =
+								stringResource(
+									R.string.response_packet_magic_header,
+								).lowercase(),
+								modifier =
+								Modifier
+									.fillMaxWidth(),
+							)
+							ConfigurationTextBox(
+								value = uiState.interfaceProxy.underloadPacketMagicHeader,
+								onValueChange = viewModel::onUnderloadPacketMagicHeader,
+								keyboardActions = keyboardActions,
+								label = stringResource(R.string.underload_packet_magic_header),
+								hint =
+								stringResource(
+									R.string.underload_packet_magic_header,
+								).lowercase(),
+								modifier =
+								Modifier
+									.fillMaxWidth(),
+							)
+							ConfigurationTextBox(
+								value = uiState.interfaceProxy.transportPacketMagicHeader,
+								onValueChange = viewModel::onTransportPacketMagicHeader,
+								keyboardActions = keyboardActions,
+								label = stringResource(R.string.transport_packet_magic_header),
+								hint =
+								stringResource(
+									R.string.transport_packet_magic_header,
+								).lowercase(),
+								modifier =
+								Modifier
+									.fillMaxWidth(),
+							)
+						}
+						Row(
+							verticalAlignment = Alignment.CenterVertically,
+							modifier =
+							Modifier
+								.fillMaxSize()
+								.padding(top = 5.dp),
+							horizontalArrangement = Arrangement.Center,
+						) {
+							TextButton(onClick = { showApplicationsDialog = true }) {
+								Text(applicationButtonText.text)
+							}
+						}
+					}
+				}
+				uiState.proxyPeers.forEachIndexed { index, peer ->
+					Surface(
+						tonalElevation = 2.dp,
+						shadowElevation = 2.dp,
+						shape = RoundedCornerShape(12.dp),
+						color = MaterialTheme.colorScheme.surface,
+						modifier =
+						(
+							if (context.isRunningOnTv()) {
+								Modifier
+									.fillMaxHeight(fillMaxHeight)
+									.fillMaxWidth(fillMaxWidth)
+							} else {
+								Modifier.fillMaxWidth(fillMaxWidth)
+							}
+							)
+							.padding(top = 10.dp, bottom = 10.dp),
+					) {
+						Column(
+							horizontalAlignment = Alignment.Start,
+							verticalArrangement = Arrangement.Top,
+							modifier =
+							Modifier
+								.padding(horizontal = 15.dp)
+								.padding(bottom = 10.dp),
+						) {
+							Row(
+								horizontalArrangement = Arrangement.SpaceBetween,
+								verticalAlignment = Alignment.CenterVertically,
+								modifier =
+								Modifier
+									.fillMaxWidth()
+									.padding(horizontal = 5.dp),
+							) {
+								SectionTitle(
+									stringResource(R.string.peer),
+									padding = screenPadding,
+								)
+								IconButton(onClick = { viewModel.onDeletePeer(index) }) {
+									val icon = Icons.Rounded.Delete
+									Icon(icon, icon.name)
+								}
+							}
+
+							ConfigurationTextBox(
+								value = peer.publicKey,
+								onValueChange = { value ->
+									viewModel.onPeerPublicKeyChange(index, value)
+								},
+								keyboardActions = keyboardActions,
+								label = stringResource(R.string.public_key),
+								hint = stringResource(R.string.base64_key),
+								modifier = Modifier.fillMaxWidth(),
+							)
+							ConfigurationTextBox(
+								value = peer.preSharedKey,
+								onValueChange = { value ->
+									viewModel.onPreSharedKeyChange(index, value)
+								},
+								keyboardActions = keyboardActions,
+								label = stringResource(R.string.preshared_key),
+								hint = stringResource(R.string.optional),
+								modifier = Modifier.fillMaxWidth(),
+							)
+							OutlinedTextField(
+								modifier = Modifier.fillMaxWidth(),
+								value = peer.persistentKeepalive,
+								enabled = true,
+								onValueChange = { value ->
+									viewModel.onPersistentKeepaliveChanged(index, value)
+								},
+								trailingIcon = {
+									Text(
+										stringResource(R.string.seconds),
+										modifier = Modifier.padding(end = 10.dp),
+									)
+								},
+								label = { Text(stringResource(R.string.persistent_keepalive)) },
+								singleLine = true,
+								placeholder = {
+									Text(stringResource(R.string.optional_no_recommend))
+								},
+								keyboardOptions = keyboardOptions,
+								keyboardActions = keyboardActions,
+							)
+							ConfigurationTextBox(
+								value = peer.endpoint,
+								onValueChange = { value ->
+									viewModel.onEndpointChange(index, value)
+								},
+								keyboardActions = keyboardActions,
+								label = stringResource(R.string.endpoint),
+								hint = stringResource(R.string.endpoint).lowercase(),
+								modifier = Modifier.fillMaxWidth(),
+							)
+							OutlinedTextField(
+								modifier = Modifier.fillMaxWidth(),
+								value = peer.allowedIps,
+								enabled = true,
+								onValueChange = { value ->
+									viewModel.onAllowedIpsChange(index, value)
+								},
+								label = { Text(stringResource(R.string.allowed_ips)) },
+								singleLine = true,
+								placeholder = {
+									Text(stringResource(R.string.comma_separated_list))
+								},
+								keyboardOptions = keyboardOptions,
+								keyboardActions = keyboardActions,
+							)
+						}
+					}
+				}
+				Row(
+					horizontalArrangement = Arrangement.SpaceEvenly,
+					verticalAlignment = Alignment.CenterVertically,
+					modifier =
+					Modifier
+						.fillMaxSize()
+						.padding(bottom = 140.dp),
+				) {
+					Row(
+						verticalAlignment = Alignment.CenterVertically,
+						horizontalArrangement = Arrangement.Center,
+					) {
+						TextButton(onClick = { viewModel.addEmptyPeer() }) {
+							Text(stringResource(R.string.add_peer))
+						}
+					}
+				}
+			}
+		}
+	}
+}

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/config/ConfigUiState.kt

@@ -0,0 +1,83 @@
+package com.zaneschepke.wireguardautotunnel.ui.screens.config
+
+import com.wireguard.config.Config
+import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
+import com.zaneschepke.wireguardautotunnel.ui.screens.config.model.InterfaceProxy
+import com.zaneschepke.wireguardautotunnel.ui.screens.config.model.PeerProxy
+import com.zaneschepke.wireguardautotunnel.util.extensions.Packages
+
+data class ConfigUiState(
+	val proxyPeers: List<PeerProxy> = arrayListOf(PeerProxy()),
+	val interfaceProxy: InterfaceProxy = InterfaceProxy(),
+	val packages: Packages = emptyList(),
+	val checkedPackageNames: List<String> = emptyList(),
+	val include: Boolean = true,
+	val isAllApplicationsEnabled: Boolean = false,
+	val loading: Boolean = true,
+	val tunnel: TunnelConfig? = null,
+	var tunnelName: String = "",
+	val isAmneziaEnabled: Boolean = false,
+) {
+	fun hasAmneziaProperties(): Boolean {
+		return this.interfaceProxy.junkPacketCount != ""
+	}
+	companion object {
+		fun from(config: Config): ConfigUiState {
+			val proxyPeers = config.peers.map { PeerProxy.from(it) }
+			val proxyInterface = InterfaceProxy.from(config.`interface`)
+			var include = true
+			var isAllApplicationsEnabled = false
+			val checkedPackages =
+				if (config.`interface`.includedApplications.isNotEmpty()) {
+					config.`interface`.includedApplications
+				} else if (config.`interface`.excludedApplications.isNotEmpty()) {
+					include = false
+					config.`interface`.excludedApplications
+				} else {
+					isAllApplicationsEnabled = true
+					emptySet()
+				}
+			return ConfigUiState(
+				proxyPeers,
+				proxyInterface,
+				emptyList(),
+				checkedPackages.toList(),
+				include,
+				isAllApplicationsEnabled,
+			)
+		}
+
+		fun from(config: org.amnezia.awg.config.Config): ConfigUiState {
+			val proxyPeers = config.peers.map { PeerProxy.from(it) }
+			val proxyInterface = InterfaceProxy.from(config.`interface`)
+			var include = true
+			var isAllApplicationsEnabled = false
+			val checkedPackages =
+				if (config.`interface`.includedApplications.isNotEmpty()) {
+					config.`interface`.includedApplications
+				} else if (config.`interface`.excludedApplications.isNotEmpty()) {
+					include = false
+					config.`interface`.excludedApplications
+				} else {
+					isAllApplicationsEnabled = true
+					emptySet()
+				}
+			return ConfigUiState(
+				proxyPeers,
+				proxyInterface,
+				emptyList(),
+				checkedPackages.toList(),
+				include,
+				isAllApplicationsEnabled,
+			)
+		}
+
+		fun from(tunnel: TunnelConfig): ConfigUiState {
+			val config = tunnel.toAmConfig()
+			return from(config).copy(
+				tunnelName = tunnel.name,
+				tunnel = tunnel,
+			)
+		}
+	}
+}

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/config/ConfigViewModel.kt

@@ -0,0 +1,591 @@
+package com.zaneschepke.wireguardautotunnel.ui.screens.config
+
+import android.Manifest
+import android.content.pm.PackageInfo
+import android.content.pm.PackageManager
+import android.os.Build
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.wireguard.config.Config
+import com.wireguard.config.Interface
+import com.wireguard.config.Peer
+import com.wireguard.crypto.Key
+import com.wireguard.crypto.KeyPair
+import com.zaneschepke.wireguardautotunnel.R
+import com.zaneschepke.wireguardautotunnel.WireGuardAutoTunnel
+import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
+import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
+import com.zaneschepke.wireguardautotunnel.module.IoDispatcher
+import com.zaneschepke.wireguardautotunnel.ui.common.snackbar.SnackbarController
+import com.zaneschepke.wireguardautotunnel.ui.screens.config.model.PeerProxy
+import com.zaneschepke.wireguardautotunnel.util.Constants
+import com.zaneschepke.wireguardautotunnel.util.NumberUtils
+import com.zaneschepke.wireguardautotunnel.util.StringValue
+import com.zaneschepke.wireguardautotunnel.util.extensions.removeAt
+import com.zaneschepke.wireguardautotunnel.util.extensions.update
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.asSharedFlow
+import kotlinx.coroutines.flow.onStart
+import kotlinx.coroutines.flow.stateIn
+import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.plus
+import timber.log.Timber
+
+@HiltViewModel(assistedFactory = ConfigViewModel.ConfigViewModelFactory::class)
+class ConfigViewModel
+@AssistedInject
+constructor(
+	private val appDataRepository: AppDataRepository,
+	@Assisted val id: Int,
+	@IoDispatcher private val ioDispatcher: CoroutineDispatcher,
+) : ViewModel() {
+	private val packageManager = WireGuardAutoTunnel.instance.packageManager
+
+	private val _saved = MutableSharedFlow<Boolean>()
+	val saved = _saved.asSharedFlow()
+
+	private val _uiState = MutableStateFlow(ConfigUiState())
+	val uiState = _uiState.onStart {
+		appDataRepository.tunnels.getById(id)?.let {
+			val packages = getQueriedPackages()
+			_uiState.value = ConfigUiState.from(it).copy(
+				packages = packages,
+			)
+		}
+	}.stateIn(
+		viewModelScope + ioDispatcher,
+		SharingStarted.WhileSubscribed(Constants.SUBSCRIPTION_TIMEOUT),
+		ConfigUiState(),
+	)
+
+	fun onTunnelNameChange(name: String) {
+		_uiState.update {
+			it.copy(tunnelName = name)
+		}
+	}
+
+	fun onIncludeChange(include: Boolean) {
+		_uiState.update {
+			it.copy(include = include)
+		}
+	}
+
+	fun cleanUpUninstalledApps() = viewModelScope.launch(ioDispatcher) {
+		uiState.value.tunnel?.let {
+			val config = it.toAmConfig()
+			val packages = getQueriedPackages()
+			val packageSet = packages.map { pack -> pack.packageName }.toSet()
+			val includedApps = config.`interface`.includedApplications.toMutableList()
+			val excludedApps = config.`interface`.excludedApplications.toMutableList()
+			if (includedApps.isEmpty() && excludedApps.isEmpty()) return@launch
+			if (includedApps.retainAll(packageSet) || excludedApps.retainAll(packageSet)) {
+				Timber.i("Removing split tunnel package name that no longer exists on the device")
+				_uiState.update { state ->
+					state.copy(
+						checkedPackageNames = if (_uiState.value.include) includedApps else excludedApps,
+					)
+				}
+				val wgQuick = buildConfig().toWgQuickString(true)
+				val amQuick = buildAmConfig().toAwgQuickString(true)
+				saveConfig(
+					it.copy(
+						amQuick = amQuick,
+						wgQuick = wgQuick,
+					),
+				)
+			}
+		}
+	}
+
+	fun onAddCheckedPackage(packageName: String) {
+		_uiState.update {
+			it.copy(
+				checkedPackageNames = it.checkedPackageNames + packageName,
+			)
+		}
+	}
+
+	fun onAllApplicationsChange(isAllApplicationsEnabled: Boolean) {
+		_uiState.update {
+			it.copy(isAllApplicationsEnabled = isAllApplicationsEnabled)
+		}
+	}
+
+	fun onRemoveCheckedPackage(packageName: String) {
+		_uiState.update {
+			it.copy(
+				checkedPackageNames = it.checkedPackageNames - packageName,
+			)
+		}
+	}
+
+	private fun getQueriedPackages(query: String = ""): List<PackageInfo> {
+		return getAllInternetCapablePackages().filter {
+			getPackageLabel(it).lowercase().contains(query.lowercase())
+		}
+	}
+
+	fun getPackageLabel(packageInfo: PackageInfo): String {
+		return packageInfo.applicationInfo?.loadLabel(packageManager).toString()
+	}
+
+	private fun getAllInternetCapablePackages(): List<PackageInfo> {
+		return getPackagesHoldingPermissions(arrayOf(Manifest.permission.INTERNET))
+	}
+
+	private fun getPackagesHoldingPermissions(permissions: Array<String>): List<PackageInfo> {
+		return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+			packageManager.getPackagesHoldingPermissions(
+				permissions,
+				PackageManager.PackageInfoFlags.of(0L),
+			)
+		} else {
+			packageManager.getPackagesHoldingPermissions(permissions, 0)
+		}
+	}
+
+	private fun isAllApplicationsEnabled(): Boolean {
+		return _uiState.value.isAllApplicationsEnabled
+	}
+
+	private fun saveConfig(tunnelConfig: TunnelConfig) = viewModelScope.launch {
+		appDataRepository.tunnels.save(tunnelConfig)
+	}
+
+	private fun updateTunnelConfig(tunnelConfig: TunnelConfig?) = viewModelScope.launch {
+		if (tunnelConfig != null) {
+			saveConfig(tunnelConfig).join()
+		}
+	}
+
+	private fun buildPeerListFromProxyPeers(): List<Peer> {
+		return _uiState.value.proxyPeers.map {
+			val builder = Peer.Builder()
+			if (it.allowedIps.isNotEmpty()) builder.parseAllowedIPs(it.allowedIps.trim())
+			if (it.publicKey.isNotEmpty()) builder.parsePublicKey(it.publicKey.trim())
+			if (it.preSharedKey.isNotEmpty()) builder.parsePreSharedKey(it.preSharedKey.trim())
+			if (it.endpoint.isNotEmpty()) builder.parseEndpoint(it.endpoint.trim())
+			if (it.persistentKeepalive.isNotEmpty()) {
+				builder.parsePersistentKeepalive(it.persistentKeepalive.trim())
+			}
+			builder.build()
+		}
+	}
+
+	private fun buildAmPeerListFromProxyPeers(): List<org.amnezia.awg.config.Peer> {
+		return _uiState.value.proxyPeers.map {
+			val builder = org.amnezia.awg.config.Peer.Builder()
+			if (it.allowedIps.isNotEmpty()) builder.parseAllowedIPs(it.allowedIps.trim())
+			if (it.publicKey.isNotEmpty()) builder.parsePublicKey(it.publicKey.trim())
+			if (it.preSharedKey.isNotEmpty()) builder.parsePreSharedKey(it.preSharedKey.trim())
+			if (it.endpoint.isNotEmpty()) builder.parseEndpoint(it.endpoint.trim())
+			if (it.persistentKeepalive.isNotEmpty()) {
+				builder.parsePersistentKeepalive(it.persistentKeepalive.trim())
+			}
+			builder.build()
+		}
+	}
+
+	private fun emptyCheckedPackagesList() {
+		_uiState.update {
+			it.copy(checkedPackageNames = emptyList())
+		}
+	}
+
+	private fun buildInterfaceListFromProxyInterface(): Interface {
+		val builder = Interface.Builder()
+		with(_uiState.value.interfaceProxy) {
+			builder.parsePrivateKey(this.privateKey.trim())
+			builder.parseAddresses(this.addresses.trim())
+			if (this.dnsServers.isNotEmpty()) {
+				builder.parseDnsServers(this.dnsServers.trim())
+			}
+			if (this.mtu.isNotEmpty()) {
+				builder.parseMtu(this.mtu.trim())
+			}
+			if (this.listenPort.isNotEmpty()) {
+				builder.parseListenPort(this.listenPort.trim())
+			}
+			if (isAllApplicationsEnabled()) emptyCheckedPackagesList()
+			if (_uiState.value.include) {
+				builder.includeApplications(
+					_uiState.value.checkedPackageNames,
+				)
+			}
+			if (!_uiState.value.include) {
+				builder.excludeApplications(
+					_uiState.value.checkedPackageNames,
+				)
+			}
+		}
+
+		return builder.build()
+	}
+
+	private fun buildAmInterfaceListFromProxyInterface(): org.amnezia.awg.config.Interface {
+		val builder = org.amnezia.awg.config.Interface.Builder()
+		with(_uiState.value.interfaceProxy) {
+			builder.parsePrivateKey(this.privateKey.trim())
+			builder.parseAddresses(this.addresses.trim())
+			if (this.dnsServers.isNotEmpty()) {
+				builder.parseDnsServers(this.dnsServers.trim())
+			}
+			if (this.mtu.isNotEmpty()) {
+				builder.parseMtu(this.mtu.trim())
+			}
+			if (this.listenPort.isNotEmpty()) {
+				builder.parseListenPort(this.listenPort.trim())
+			}
+			if (isAllApplicationsEnabled()) emptyCheckedPackagesList()
+			if (_uiState.value.include) {
+				builder.includeApplications(
+					_uiState.value.checkedPackageNames,
+				)
+			}
+			if (!_uiState.value.include) {
+				builder.excludeApplications(
+					_uiState.value.checkedPackageNames,
+				)
+			}
+			if (this.junkPacketCount.isNotEmpty()) {
+				builder.setJunkPacketCount(
+					this.junkPacketCount.trim().toInt(),
+				)
+			}
+			if (this.junkPacketMinSize.isNotEmpty()) {
+				builder.setJunkPacketMinSize(
+					this.junkPacketMinSize.trim().toInt(),
+				)
+			}
+			if (this.junkPacketMaxSize.isNotEmpty()) {
+				builder.setJunkPacketMaxSize(
+					this.junkPacketMaxSize.trim().toInt(),
+				)
+			}
+			if (this.initPacketJunkSize.isNotEmpty()) {
+				builder.setInitPacketJunkSize(
+					this.initPacketJunkSize.trim().toInt(),
+				)
+			}
+			if (this.responsePacketJunkSize.isNotEmpty()) {
+				builder.setResponsePacketJunkSize(
+					this.responsePacketJunkSize.trim().toInt(),
+				)
+			}
+			if (this.initPacketMagicHeader.isNotEmpty()) {
+				builder.setInitPacketMagicHeader(
+					this.initPacketMagicHeader.trim().toLong(),
+				)
+			}
+			if (this.responsePacketMagicHeader.isNotEmpty()) {
+				builder.setResponsePacketMagicHeader(
+					this.responsePacketMagicHeader.trim().toLong(),
+				)
+			}
+			if (this.transportPacketMagicHeader.isNotEmpty()) {
+				builder.setTransportPacketMagicHeader(
+					this.transportPacketMagicHeader.trim().toLong(),
+				)
+			}
+			if (this.underloadPacketMagicHeader.isNotEmpty()) {
+				builder.setUnderloadPacketMagicHeader(
+					this.underloadPacketMagicHeader.trim().toLong(),
+				)
+			}
+		}
+
+		return builder.build()
+	}
+
+	private fun buildConfig(): Config {
+		val peerList = buildPeerListFromProxyPeers()
+		val wgInterface = buildInterfaceListFromProxyInterface()
+		return Config.Builder().addPeers(peerList).setInterface(wgInterface).build()
+	}
+
+	private fun buildAmConfig(): org.amnezia.awg.config.Config {
+		val peerList = buildAmPeerListFromProxyPeers()
+		val amInterface = buildAmInterfaceListFromProxyInterface()
+		return org.amnezia.awg.config.Config.Builder().addPeers(
+			peerList,
+		).setInterface(amInterface)
+			.build()
+	}
+
+	fun onSaveAllChanges() = viewModelScope.launch {
+		kotlin.runCatching {
+			val wgQuick = buildConfig().toWgQuickString(true)
+			val amQuick = buildAmConfig().toAwgQuickString(true)
+			val tunnelConfig = uiState.value.tunnel?.copy(
+				name = _uiState.value.tunnelName,
+				amQuick = amQuick,
+				wgQuick = wgQuick,
+			) ?: TunnelConfig(
+				name = _uiState.value.tunnelName,
+				wgQuick = wgQuick,
+				amQuick = amQuick,
+			)
+			updateTunnelConfig(tunnelConfig)
+			SnackbarController.showMessage(
+				StringValue.StringResource(R.string.config_changes_saved),
+			)
+			_saved.emit(true)
+		}.onFailure {
+			Timber.e(it)
+			val message = it.message?.substringAfter(":", missingDelimiterValue = "")
+			val stringValue = if (message.isNullOrBlank()) {
+				StringValue.StringResource(R.string.unknown_error)
+			} else {
+				StringValue.DynamicString(message)
+			}
+			SnackbarController.showMessage(stringValue)
+		}
+	}
+
+	fun onPeerPublicKeyChange(index: Int, value: String) {
+		_uiState.update {
+			it.copy(
+				proxyPeers =
+				_uiState.value.proxyPeers.update(
+					index,
+					_uiState.value.proxyPeers[index].copy(publicKey = value),
+				),
+			)
+		}
+	}
+
+	fun onPreSharedKeyChange(index: Int, value: String) {
+		_uiState.update {
+			it.copy(
+				proxyPeers =
+				_uiState.value.proxyPeers.update(
+					index,
+					_uiState.value.proxyPeers[index].copy(preSharedKey = value),
+				),
+			)
+		}
+	}
+
+	fun onEndpointChange(index: Int, value: String) {
+		_uiState.update {
+			it.copy(
+				proxyPeers =
+				_uiState.value.proxyPeers.update(
+					index,
+					_uiState.value.proxyPeers[index].copy(endpoint = value),
+				),
+			)
+		}
+	}
+
+	fun onAllowedIpsChange(index: Int, value: String) {
+		_uiState.update {
+			it.copy(
+				proxyPeers =
+				_uiState.value.proxyPeers.update(
+					index,
+					_uiState.value.proxyPeers[index].copy(allowedIps = value),
+				),
+			)
+		}
+	}
+
+	fun onPersistentKeepaliveChanged(index: Int, value: String) {
+		_uiState.update {
+			it.copy(
+				proxyPeers =
+				_uiState.value.proxyPeers.update(
+					index,
+					_uiState.value.proxyPeers[index].copy(persistentKeepalive = value),
+				),
+			)
+		}
+	}
+
+	fun onDeletePeer(index: Int) {
+		_uiState.update {
+			it.copy(
+				proxyPeers = _uiState.value.proxyPeers.removeAt(index),
+			)
+		}
+	}
+
+	fun addEmptyPeer() {
+		_uiState.update {
+			it.copy(proxyPeers = _uiState.value.proxyPeers + PeerProxy())
+		}
+	}
+
+	fun generateKeyPair() {
+		val keyPair = KeyPair()
+		_uiState.update {
+			it.copy(
+				interfaceProxy =
+				it.interfaceProxy.copy(
+					privateKey = keyPair.privateKey.toBase64(),
+					publicKey = keyPair.publicKey.toBase64(),
+				),
+			)
+		}
+	}
+
+	fun onAddressesChanged(value: String) {
+		_uiState.update {
+			it.copy(
+				interfaceProxy = it.interfaceProxy.copy(addresses = value),
+			)
+		}
+	}
+
+	fun onListenPortChanged(value: String) {
+		_uiState.update {
+			it.copy(
+				interfaceProxy = it.interfaceProxy.copy(listenPort = value),
+			)
+		}
+	}
+
+	fun onDnsServersChanged(value: String) {
+		_uiState.update {
+			it.copy(
+				interfaceProxy = it.interfaceProxy.copy(dnsServers = value),
+			)
+		}
+	}
+
+	fun onMtuChanged(value: String) {
+		_uiState.update {
+			it.copy(interfaceProxy = it.interfaceProxy.copy(mtu = value))
+		}
+	}
+
+	private fun onInterfacePublicKeyChange(value: String) {
+		_uiState.update {
+			it.copy(
+				interfaceProxy = it.interfaceProxy.copy(publicKey = value),
+			)
+		}
+	}
+
+	fun onPrivateKeyChange(value: String) {
+		_uiState.update {
+			it.copy(
+				interfaceProxy = it.interfaceProxy.copy(privateKey = value),
+			)
+		}
+		if (NumberUtils.isValidKey(value)) {
+			val pair = KeyPair(Key.fromBase64(value))
+			onInterfacePublicKeyChange(pair.publicKey.toBase64())
+		} else {
+			onInterfacePublicKeyChange("")
+		}
+	}
+
+	fun emitQueriedPackages(query: String) {
+		val packages =
+			getAllInternetCapablePackages().filter {
+				getPackageLabel(it).lowercase().contains(query.lowercase())
+			}
+		_uiState.update { it.copy(packages = packages) }
+	}
+
+	fun onJunkPacketCountChanged(value: String) {
+		_uiState.update {
+			it.copy(
+				interfaceProxy = it.interfaceProxy.copy(junkPacketCount = value),
+			)
+		}
+	}
+
+	fun onJunkPacketMinSizeChanged(value: String) {
+		_uiState.update {
+			it.copy(
+				interfaceProxy = it.interfaceProxy.copy(junkPacketMinSize = value),
+			)
+		}
+	}
+
+	fun onJunkPacketMaxSizeChanged(value: String) {
+		_uiState.update {
+			it.copy(
+				interfaceProxy = it.interfaceProxy.copy(junkPacketMaxSize = value),
+			)
+		}
+	}
+
+	fun onInitPacketJunkSizeChanged(value: String) {
+		_uiState.update {
+			it.copy(
+				interfaceProxy = it.interfaceProxy.copy(initPacketJunkSize = value),
+			)
+		}
+	}
+
+	fun onResponsePacketJunkSize(value: String) {
+		_uiState.update {
+			it.copy(
+				interfaceProxy =
+				it.interfaceProxy.copy(
+					responsePacketJunkSize = value,
+				),
+			)
+		}
+	}
+
+	fun onInitPacketMagicHeader(value: String) {
+		_uiState.update {
+			it.copy(
+				interfaceProxy =
+				it.interfaceProxy.copy(
+					initPacketMagicHeader = value,
+				),
+			)
+		}
+	}
+
+	fun onResponsePacketMagicHeader(value: String) {
+		_uiState.update {
+			it.copy(
+				interfaceProxy =
+				it.interfaceProxy.copy(
+					responsePacketMagicHeader = value,
+				),
+			)
+		}
+	}
+
+	fun onTransportPacketMagicHeader(value: String) {
+		_uiState.update {
+			it.copy(
+				interfaceProxy =
+				it.interfaceProxy.copy(
+					transportPacketMagicHeader = value,
+				),
+			)
+		}
+	}
+
+	fun onUnderloadPacketMagicHeader(value: String) {
+		_uiState.update {
+			it.copy(
+				interfaceProxy =
+				it.interfaceProxy.copy(
+					underloadPacketMagicHeader = value,
+				),
+			)
+		}
+	}
+
+	@AssistedFactory
+	interface ConfigViewModelFactory {
+		fun create(id: Int): ConfigViewModel
+	}
+}

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/config/components/ApplicationSelectionDialog.kt

@@ -0,0 +1,199 @@
+package com.zaneschepke.wireguardautotunnel.ui.screens.config.components
+
+import android.content.pm.PackageInfo
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.rounded.Android
+import androidx.compose.material3.BasicAlertDialog
+import androidx.compose.material3.Checkbox
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Switch
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import com.google.accompanist.drawablepainter.DrawablePainter
+import com.zaneschepke.wireguardautotunnel.R
+import com.zaneschepke.wireguardautotunnel.ui.common.SearchBar
+import com.zaneschepke.wireguardautotunnel.ui.screens.config.ConfigUiState
+import com.zaneschepke.wireguardautotunnel.ui.screens.config.ConfigViewModel
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun ApplicationSelectionDialog(viewModel: ConfigViewModel, uiState: ConfigUiState, onDismiss: () -> Unit) {
+	val context = LocalContext.current
+	val licenseComparator = compareBy<PackageInfo> { viewModel.getPackageLabel(it) }
+
+	val sortedPackages = remember(uiState.packages, licenseComparator) {
+		uiState.packages.sortedWith(licenseComparator)
+	}
+	BasicAlertDialog(
+		onDismissRequest = { onDismiss() },
+	) {
+		Surface(
+			tonalElevation = 2.dp,
+			shadowElevation = 2.dp,
+			shape = RoundedCornerShape(12.dp),
+			color = MaterialTheme.colorScheme.surface,
+			modifier =
+			Modifier
+				.fillMaxWidth()
+				.fillMaxHeight(if (uiState.isAllApplicationsEnabled) 1 / 5f else 4 / 5f),
+		) {
+			Column(
+				modifier =
+				Modifier
+					.fillMaxWidth(),
+			) {
+				Row(
+					modifier =
+					Modifier
+						.fillMaxWidth()
+						.padding(horizontal = 20.dp, vertical = 7.dp),
+					verticalAlignment = Alignment.CenterVertically,
+					horizontalArrangement = Arrangement.SpaceBetween,
+				) {
+					Text(stringResource(id = R.string.tunnel_all))
+					Switch(
+						checked = uiState.isAllApplicationsEnabled,
+						onCheckedChange = viewModel::onAllApplicationsChange,
+					)
+				}
+				if (!uiState.isAllApplicationsEnabled) {
+					Row(
+						modifier =
+						Modifier
+							.fillMaxWidth()
+							.padding(horizontal = 20.dp, vertical = 7.dp),
+						verticalAlignment = Alignment.CenterVertically,
+						horizontalArrangement = Arrangement.SpaceBetween,
+					) {
+						Row(
+							verticalAlignment = Alignment.CenterVertically,
+							horizontalArrangement = Arrangement.SpaceBetween,
+						) {
+							Text(stringResource(id = R.string.include))
+							Checkbox(
+								checked = uiState.include,
+								onCheckedChange = {
+									viewModel.onIncludeChange(!uiState.include)
+								},
+							)
+						}
+						Row(
+							verticalAlignment = Alignment.CenterVertically,
+							horizontalArrangement = Arrangement.SpaceBetween,
+						) {
+							Text(stringResource(id = R.string.exclude))
+							Checkbox(
+								checked = !uiState.include,
+								onCheckedChange = {
+									viewModel.onIncludeChange(!uiState.include)
+								},
+							)
+						}
+					}
+					Row(
+						modifier =
+						Modifier
+							.fillMaxWidth()
+							.padding(horizontal = 20.dp, vertical = 7.dp),
+						verticalAlignment = Alignment.CenterVertically,
+						horizontalArrangement = Arrangement.SpaceBetween,
+					) {
+						SearchBar(viewModel::emitQueriedPackages)
+					}
+					Spacer(Modifier.padding(5.dp))
+					LazyColumn(
+						horizontalAlignment = Alignment.Start,
+						verticalArrangement = Arrangement.Top,
+						modifier = Modifier.fillMaxHeight(19 / 22f),
+					) {
+						items(sortedPackages, key = { it.packageName }) { pack ->
+							Row(
+								verticalAlignment = Alignment.CenterVertically,
+								horizontalArrangement = Arrangement.SpaceBetween,
+								modifier =
+								Modifier
+									.fillMaxSize()
+									.padding(5.dp).padding(end = 25.dp),
+							) {
+								Row(modifier = Modifier.fillMaxWidth().padding(start = 5.dp)) {
+									val drawable =
+										pack.applicationInfo?.loadIcon(context.packageManager)
+									val iconSize = 35.dp
+									if (drawable != null) {
+										Image(
+											painter = DrawablePainter(drawable),
+											stringResource(id = R.string.icon),
+											modifier = Modifier.size(iconSize),
+										)
+									} else {
+										val icon = Icons.Rounded.Android
+										Icon(
+											icon,
+											icon.name,
+											modifier = Modifier.size(iconSize),
+										)
+									}
+									Text(
+										viewModel.getPackageLabel(pack),
+										modifier = Modifier.padding(5.dp),
+									)
+								}
+								Checkbox(
+									modifier = Modifier.fillMaxSize(),
+									checked =
+									(
+										uiState.checkedPackageNames.contains(
+											pack.packageName,
+										)
+										),
+									onCheckedChange = {
+										if (it) {
+											viewModel.onAddCheckedPackage(pack.packageName)
+										} else {
+											viewModel.onRemoveCheckedPackage(pack.packageName)
+										}
+									},
+								)
+							}
+						}
+					}
+				}
+				Row(
+					verticalAlignment = Alignment.CenterVertically,
+					modifier =
+					Modifier
+						.fillMaxSize()
+						.padding(top = 5.dp),
+					horizontalArrangement = Arrangement.Center,
+				) {
+					TextButton(onClick = { onDismiss() }) {
+						Text(stringResource(R.string.done))
+					}
+				}
+			}
+		}
+	}
+}

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/config/model/InterfaceProxy.kt

@@ -0,0 +1,121 @@
+package com.zaneschepke.wireguardautotunnel.ui.screens.config.model
+
+import com.wireguard.config.Interface
+
+data class InterfaceProxy(
+	val privateKey: String = "",
+	val publicKey: String = "",
+	val addresses: String = "",
+	val dnsServers: String = "",
+	val listenPort: String = "",
+	val mtu: String = "",
+	val junkPacketCount: String = "",
+	val junkPacketMinSize: String = "",
+	val junkPacketMaxSize: String = "",
+	val initPacketJunkSize: String = "",
+	val responsePacketJunkSize: String = "",
+	val initPacketMagicHeader: String = "",
+	val responsePacketMagicHeader: String = "",
+	val underloadPacketMagicHeader: String = "",
+	val transportPacketMagicHeader: String = "",
+) {
+	companion object {
+		fun from(i: Interface): InterfaceProxy {
+			return InterfaceProxy(
+				publicKey = i.keyPair.publicKey.toBase64().trim(),
+				privateKey = i.keyPair.privateKey.toBase64().trim(),
+				addresses = i.addresses.joinToString(", ").trim(),
+				dnsServers = listOf(
+					i.dnsServers.joinToString(", ").replace("/", "").trim(),
+					i.dnsSearchDomains.joinToString(", ").trim(),
+				).filter { it.length > 0 }.joinToString(", "),
+				listenPort =
+				if (i.listenPort.isPresent) {
+					i.listenPort.get().toString().trim()
+				} else {
+					""
+				},
+				mtu = if (i.mtu.isPresent) i.mtu.get().toString().trim() else "",
+			)
+		}
+
+		fun from(i: org.amnezia.awg.config.Interface): InterfaceProxy {
+			return InterfaceProxy(
+				publicKey = i.keyPair.publicKey.toBase64().trim(),
+				privateKey = i.keyPair.privateKey.toBase64().trim(),
+				addresses = i.addresses.joinToString(", ").trim(),
+				dnsServers = (i.dnsServers + i.dnsSearchDomains).joinToString(", ").replace("/", "").trim(),
+				listenPort =
+				if (i.listenPort.isPresent) {
+					i.listenPort.get().toString().trim()
+				} else {
+					""
+				},
+				mtu = if (i.mtu.isPresent) i.mtu.get().toString().trim() else "",
+				junkPacketCount =
+				if (i.junkPacketCount.isPresent) {
+					i.junkPacketCount.get()
+						.toString()
+				} else {
+					""
+				},
+				junkPacketMinSize =
+				if (i.junkPacketMinSize.isPresent) {
+					i.junkPacketMinSize.get()
+						.toString()
+				} else {
+					""
+				},
+				junkPacketMaxSize =
+				if (i.junkPacketMaxSize.isPresent) {
+					i.junkPacketMaxSize.get()
+						.toString()
+				} else {
+					""
+				},
+				initPacketJunkSize =
+				if (i.initPacketJunkSize.isPresent) {
+					i.initPacketJunkSize.get()
+						.toString()
+				} else {
+					""
+				},
+				responsePacketJunkSize =
+				if (i.responsePacketJunkSize.isPresent) {
+					i.responsePacketJunkSize.get()
+						.toString()
+				} else {
+					""
+				},
+				initPacketMagicHeader =
+				if (i.initPacketMagicHeader.isPresent) {
+					i.initPacketMagicHeader.get()
+						.toString()
+				} else {
+					""
+				},
+				responsePacketMagicHeader =
+				if (i.responsePacketMagicHeader.isPresent) {
+					i.responsePacketMagicHeader.get()
+						.toString()
+				} else {
+					""
+				},
+				transportPacketMagicHeader =
+				if (i.transportPacketMagicHeader.isPresent) {
+					i.transportPacketMagicHeader.get()
+						.toString()
+				} else {
+					""
+				},
+				underloadPacketMagicHeader =
+				if (i.underloadPacketMagicHeader.isPresent) {
+					i.underloadPacketMagicHeader.get()
+						.toString()
+				} else {
+					""
+				},
+			)
+		}
+	}
+}

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/config/model/PeerProxy.kt

@@ -1,34 +1,14 @@
-package com.zaneschepke.wireguardautotunnel.ui.screens.tunneloptions.config.model
+package com.zaneschepke.wireguardautotunnel.ui.screens.config.model
 
 import com.wireguard.config.Peer
-import com.zaneschepke.wireguardautotunnel.util.extensions.joinAndTrim
 
 data class PeerProxy(
 	val publicKey: String = "",
 	val preSharedKey: String = "",
 	val persistentKeepalive: String = "",
 	val endpoint: String = "",
-	val allowedIps: String = IPV4_WILDCARD.joinAndTrim(),
+	val allowedIps: String = IPV4_WILDCARD.joinToString(", ").trim(),
 ) {
-	fun toWgPeer(): Peer {
-		return Peer.Builder().apply {
-			parsePublicKey(publicKey)
-			if (preSharedKey.isNotBlank()) parsePreSharedKey(preSharedKey)
-			if (persistentKeepalive.isNotBlank()) parsePersistentKeepalive(persistentKeepalive)
-			parseEndpoint(endpoint)
-			parseAllowedIPs(allowedIps)
-		}.build()
-	}
-	fun toAmPeer(): org.amnezia.awg.config.Peer {
-		return org.amnezia.awg.config.Peer.Builder().apply {
-			parsePublicKey(publicKey)
-			if (preSharedKey.isNotBlank()) parsePreSharedKey(preSharedKey)
-			if (persistentKeepalive.isNotBlank()) parsePersistentKeepalive(persistentKeepalive)
-			parseEndpoint(endpoint)
-			parseAllowedIPs(allowedIps)
-		}.build()
-	}
-
 	companion object {
 		fun from(peer: Peer): PeerProxy {
 			return PeerProxy(

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/main/MainScreen.kt

@@ -1,7 +1,13 @@
 package com.zaneschepke.wireguardautotunnel.ui.screens.main
 
+import android.content.Intent
+import android.net.Uri
+import android.net.VpnService
+import android.provider.Settings
 import androidx.activity.compose.rememberLauncherForActivityResult
+import androidx.activity.result.ActivityResult
 import androidx.activity.result.contract.ActivityResultContracts
+import androidx.appcompat.app.AppCompatActivity.RESULT_OK
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.gestures.ScrollableDefaults
 import androidx.compose.foundation.gestures.detectTapGestures
@@ -31,10 +37,8 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.input.pointer.pointerInput
-import androidx.compose.ui.platform.LocalClipboardManager
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
 import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
@@ -45,58 +49,50 @@ import com.zaneschepke.wireguardautotunnel.ui.common.dialog.InfoDialog
 import com.zaneschepke.wireguardautotunnel.ui.common.functions.rememberFileImportLauncherForResult
 import com.zaneschepke.wireguardautotunnel.ui.common.navigation.LocalNavController
 import com.zaneschepke.wireguardautotunnel.ui.common.navigation.TopNavBar
-import com.zaneschepke.wireguardautotunnel.ui.common.permission.vpn.withVpnPermission
-import com.zaneschepke.wireguardautotunnel.ui.common.permission.withIgnoreBatteryOpt
 import com.zaneschepke.wireguardautotunnel.ui.common.snackbar.SnackbarController
 import com.zaneschepke.wireguardautotunnel.ui.screens.main.components.AutoTunnelRowItem
 import com.zaneschepke.wireguardautotunnel.ui.screens.main.components.GettingStartedLabel
 import com.zaneschepke.wireguardautotunnel.ui.screens.main.components.ScrollDismissFab
 import com.zaneschepke.wireguardautotunnel.ui.screens.main.components.TunnelImportSheet
 import com.zaneschepke.wireguardautotunnel.ui.screens.main.components.TunnelRowItem
+import com.zaneschepke.wireguardautotunnel.ui.screens.main.components.VpnDeniedDialog
 import com.zaneschepke.wireguardautotunnel.util.Constants
+import com.zaneschepke.wireguardautotunnel.util.extensions.isBatteryOptimizationsDisabled
 import com.zaneschepke.wireguardautotunnel.util.extensions.isRunningOnTv
 import com.zaneschepke.wireguardautotunnel.util.extensions.openWebUrl
-import com.zaneschepke.wireguardautotunnel.util.extensions.scaledHeight
-import java.text.Collator
-import java.util.Locale
 
 @OptIn(ExperimentalFoundationApi::class)
 @Composable
 fun MainScreen(viewModel: MainViewModel = hiltViewModel(), uiState: AppUiState) {
 	val context = LocalContext.current
 	val navController = LocalNavController.current
-	val clipboard = LocalClipboardManager.current
 	val snackbar = SnackbarController.current
 
 	var showBottomSheet by remember { mutableStateOf(false) }
+	var showVpnPermissionDialog by remember { mutableStateOf(false) }
 	var isFabVisible by rememberSaveable { mutableStateOf(true) }
 	var showDeleteTunnelAlertDialog by remember { mutableStateOf(false) }
 	var selectedTunnel by remember { mutableStateOf<TunnelConfig?>(null) }
 	val isRunningOnTv = remember { context.isRunningOnTv() }
 
-	val collator = Collator.getInstance(Locale.getDefault())
-
-	val sortedTunnels = remember(uiState.tunnels) {
-		uiState.tunnels.sortedWith(compareBy(collator) { it.name })
-	}
-
-	val startAutoTunnel = withVpnPermission<Unit> { viewModel.onToggleAutoTunnel() }
-	val startTunnel = withVpnPermission<TunnelConfig> {
-		viewModel.onTunnelStart(it, uiState.settings.isKernelEnabled)
-	}
-	val autoTunnelToggleBattery = withIgnoreBatteryOpt(uiState.generalState.isBatteryOptimizationDisableShown) {
-		if (!uiState.generalState.isBatteryOptimizationDisableShown) viewModel.setBatteryOptimizeDisableShown()
-		if (uiState.settings.isKernelEnabled) {
-			viewModel.onToggleAutoTunnel()
-		} else {
-			startAutoTunnel.invoke(Unit)
-		}
-	}
-
 	val nestedScrollConnection = remember {
 		NestedScrollListener({ isFabVisible = false }, { isFabVisible = true })
 	}
 
+	val vpnActivity =
+		rememberLauncherForActivityResult(
+			ActivityResultContracts.StartActivityForResult(),
+			onResult = {
+				if (it.resultCode != RESULT_OK) showVpnPermissionDialog = true
+			},
+		)
+	val batteryActivity =
+		rememberLauncherForActivityResult(
+			ActivityResultContracts.StartActivityForResult(),
+		) { result: ActivityResult ->
+			viewModel.setBatteryOptimizeDisableShown()
+		}
+
 	val tunnelFileImportResultLauncher = rememberFileImportLauncherForResult(onNoFileExplorer = {
 		snackbar.showMessage(
 			context.getString(R.string.error_no_file_explorer),
@@ -112,11 +108,13 @@ fun MainScreen(viewModel: MainViewModel = hiltViewModel(), uiState: AppUiState)
 		navController.navigate(Route.Scanner)
 	}
 
+	VpnDeniedDialog(showVpnPermissionDialog, onDismiss = { showVpnPermissionDialog = false })
+
 	if (showDeleteTunnelAlertDialog) {
 		InfoDialog(
 			onDismiss = { showDeleteTunnelAlertDialog = false },
 			onAttest = {
-				selectedTunnel?.let { viewModel.onDelete(it) }
+				selectedTunnel?.let { viewModel::onDelete }
 				showDeleteTunnelAlertDialog = false
 				selectedTunnel = null
 			},
@@ -126,13 +124,35 @@ fun MainScreen(viewModel: MainViewModel = hiltViewModel(), uiState: AppUiState)
 		)
 	}
 
-	fun onTunnelToggle(checked: Boolean, tunnel: TunnelConfig) {
-		if (!checked) viewModel.onTunnelStop().also { return }
-		if (uiState.settings.isKernelEnabled) {
-			viewModel.onTunnelStart(tunnel, uiState.settings.isKernelEnabled)
-		} else {
-			startTunnel.invoke(tunnel)
+	fun requestBatteryOptimizationsDisabled() {
+		val intent =
+			Intent().apply {
+				action = Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS
+				data = Uri.parse("package:${context.packageName}")
+			}
+		batteryActivity.launch(intent)
+	}
+
+	fun onAutoTunnelToggle() {
+		if (!uiState.generalState.isBatteryOptimizationDisableShown &&
+			!context.isBatteryOptimizationsDisabled() && !isRunningOnTv
+		) {
+			return requestBatteryOptimizationsDisabled()
 		}
+		val intent = if (!uiState.settings.isKernelEnabled) {
+			VpnService.prepare(context)
+		} else {
+			null
+		}
+		if (intent != null) return vpnActivity.launch(intent)
+		viewModel.onToggleAutoTunnel()
+	}
+
+	fun onTunnelToggle(checked: Boolean, tunnel: TunnelConfig) {
+		val intent = if (uiState.settings.isKernelEnabled) null else VpnService.prepare(context)
+		if (intent != null) return vpnActivity.launch(intent)
+		if (!checked) viewModel.onTunnelStop(tunnel).also { return }
+		viewModel.onTunnelStart(tunnel, uiState.settings.isKernelEnabled)
 	}
 
 	Scaffold(
@@ -179,17 +199,12 @@ fun MainScreen(viewModel: MainViewModel = hiltViewModel(), uiState: AppUiState)
 				)
 			}
 		},
-	) { padding ->
+	) {
 		TunnelImportSheet(
 			showBottomSheet,
 			onDismiss = { showBottomSheet = false },
 			onFileClick = { tunnelFileImportResultLauncher.launch(Constants.ALLOWED_TV_FILE_TYPES) },
 			onQrClick = { requestPermissionLauncher.launch(android.Manifest.permission.CAMERA) },
-			onClipboardClick = {
-				clipboard.getText()?.text?.let {
-					viewModel.onClipboardImport(it)
-				}
-			},
 			onManualImportClick = {
 				navController.navigate(
 					Route.Config(Constants.MANUAL_TUNNEL_CONFIG_ID),
@@ -198,10 +213,10 @@ fun MainScreen(viewModel: MainViewModel = hiltViewModel(), uiState: AppUiState)
 		)
 		LazyColumn(
 			horizontalAlignment = Alignment.Start,
-			verticalArrangement = Arrangement.spacedBy(5.dp, Alignment.Top),
+			verticalArrangement = Arrangement.Top,
 			modifier =
 			Modifier
-				.fillMaxSize().padding(padding).padding(top = 24.dp.scaledHeight())
+				.fillMaxSize().padding(it)
 				.overscroll(ScrollableDefaults.overscrollEffect())
 				.nestedScroll(nestedScrollConnection),
 			state = rememberLazyListState(0, uiState.tunnels.count()),
@@ -215,19 +230,22 @@ fun MainScreen(viewModel: MainViewModel = hiltViewModel(), uiState: AppUiState)
 				}
 			} else {
 				item {
-					AutoTunnelRowItem(uiState) {
-						autoTunnelToggleBattery.invoke()
-					}
+					AutoTunnelRowItem(uiState, {
+						onAutoTunnelToggle()
+					})
 				}
 			}
 			items(
-				sortedTunnels,
+				uiState.tunnels,
 				key = { tunnel -> tunnel.id },
 			) { tunnel ->
+				val isActive = uiState.tunnels.any {
+					it.id == tunnel.id &&
+						it.isActive
+				}
 				val expanded = uiState.generalState.isTunnelStatsExpanded
 				TunnelRowItem(
-					tunnel.id == uiState.vpnState.tunnelConfig?.id &&
-						uiState.vpnState.status.isUp(),
+					isActive,
 					expanded,
 					selectedTunnel?.id == tunnel.id,
 					tunnel,

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/main/MainViewModel.kt

@@ -72,9 +72,9 @@ constructor(
 		tunnelService.get().startTunnel(tunnelConfig, background)
 	}
 
-	fun onTunnelStop() = viewModelScope.launch {
+	fun onTunnelStop(tunnel: TunnelConfig) = viewModelScope.launch {
 		Timber.i("Stopping active tunnel")
-		tunnelService.get().stopTunnel()
+		tunnelService.get().stopTunnel(tunnel)
 	}
 
 	private fun generateQrCodeDefaultName(config: String): String {
@@ -159,7 +159,18 @@ constructor(
 	}
 
 	fun onToggleAutoTunnel() = viewModelScope.launch {
-		serviceManager.toggleAutoTunnel(false)
+		val settings = appDataRepository.settings.getSettings()
+		val toggled = !settings.isAutoTunnelEnabled
+		if (toggled) {
+			serviceManager.startAutoTunnel(false)
+		} else {
+			serviceManager.stopAutoTunnel()
+		}
+		appDataRepository.settings.save(
+			settings.copy(
+				isAutoTunnelEnabled = toggled,
+			),
+		)
 	}
 
 	private suspend fun saveTunnelsFromZipUri(uri: Uri, context: Context) {
@@ -241,17 +252,13 @@ constructor(
 
 	fun onCopyTunnel(tunnel: TunnelConfig) = viewModelScope.launch {
 		saveTunnel(
-			TunnelConfig(name = makeTunnelNameUnique(tunnel.name), wgQuick = tunnel.wgQuick, amQuick = tunnel.amQuick),
+			tunnel.copy(
+				id = 0,
+				isPrimaryTunnel = false,
+				isMobileDataTunnel = false,
+				isActive = false,
+				name = makeTunnelNameUnique(tunnel.name),
+			),
 		)
 	}
-
-	fun onClipboardImport(config: String) = viewModelScope.launch(ioDispatcher) {
-		runCatching {
-			val amConfig = TunnelConfig.configFromAmQuick(config)
-			val tunnelConfig = TunnelConfig.tunnelConfigFromAmConfig(amConfig, makeTunnelNameUnique(generateQrCodeDefaultName(config)))
-			saveTunnel(tunnelConfig)
-		}.onFailure {
-			SnackbarController.showMessage(StringValue.StringResource(R.string.error_file_format))
-		}
-	}
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/main/components/AutoTunnelRowItem.kt

@@ -5,8 +5,10 @@ import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.rounded.Bolt
 import androidx.compose.material3.Icon
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.scale
+import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
@@ -17,10 +19,12 @@ import com.zaneschepke.wireguardautotunnel.ui.common.ExpandingRowListItem
 import com.zaneschepke.wireguardautotunnel.ui.common.button.ScaledSwitch
 import com.zaneschepke.wireguardautotunnel.ui.theme.SilverTree
 import com.zaneschepke.wireguardautotunnel.util.extensions.isRunningOnTv
+import com.zaneschepke.wireguardautotunnel.util.extensions.scaledHeight
 
 @Composable
 fun AutoTunnelRowItem(appUiState: AppUiState, onToggle: () -> Unit) {
 	val context = LocalContext.current
+	val itemFocusRequester = remember { FocusRequester() }
 	ExpandingRowListItem(
 		leading = {
 			val icon = Icons.Rounded.Bolt
@@ -29,7 +33,7 @@ fun AutoTunnelRowItem(appUiState: AppUiState, onToggle: () -> Unit) {
 				icon.name,
 				modifier =
 				Modifier
-					.size(16.dp).scale(1.5f),
+					.size(16.dp.scaledHeight()).scale(1.5f),
 				tint =
 				if (!appUiState.autoTunnelActive) {
 					Color.Gray
@@ -49,7 +53,7 @@ fun AutoTunnelRowItem(appUiState: AppUiState, onToggle: () -> Unit) {
 		},
 		onClick = {
 			if (context.isRunningOnTv()) {
-				onToggle()
+				itemFocusRequester.requestFocus()
 			}
 		},
 		isExpanded = false,

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/main/components/TunnelImportSheet.kt

@@ -5,7 +5,6 @@ import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.ContentPasteGo
 import androidx.compose.material.icons.filled.Create
 import androidx.compose.material.icons.filled.FileOpen
 import androidx.compose.material.icons.filled.QrCode
@@ -23,17 +22,9 @@ import androidx.compose.ui.unit.dp
 import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.util.extensions.isRunningOnTv
 
-// TODO refactor this component
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
-fun TunnelImportSheet(
-	show: Boolean,
-	onDismiss: () -> Unit,
-	onFileClick: () -> Unit,
-	onQrClick: () -> Unit,
-	onManualImportClick: () -> Unit,
-	onClipboardClick: () -> Unit,
-) {
+fun TunnelImportSheet(show: Boolean, onDismiss: () -> Unit, onFileClick: () -> Unit, onQrClick: () -> Unit, onManualImportClick: () -> Unit) {
 	val sheetState = rememberModalBottomSheetState()
 
 	val context = LocalContext.current
@@ -86,28 +77,6 @@ fun TunnelImportSheet(
 						modifier = Modifier.padding(10.dp),
 					)
 				}
-				HorizontalDivider()
-				Row(
-					modifier =
-					Modifier
-						.fillMaxWidth()
-						.clickable {
-							onDismiss()
-							onClipboardClick()
-						}
-						.padding(10.dp),
-				) {
-					val icon = Icons.Filled.ContentPasteGo
-					Icon(
-						icon,
-						contentDescription = icon.name,
-						modifier = Modifier.padding(10.dp),
-					)
-					Text(
-						stringResource(id = R.string.add_from_clipboard),
-						modifier = Modifier.padding(10.dp),
-					)
-				}
 			}
 			HorizontalDivider()
 			Row(

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/main/components/TunnelRowItem.kt

@@ -9,7 +9,6 @@ import androidx.compose.material.icons.rounded.CopyAll
 import androidx.compose.material.icons.rounded.Delete
 import androidx.compose.material.icons.rounded.Info
 import androidx.compose.material.icons.rounded.Settings
-import androidx.compose.material.icons.rounded.SettingsEthernet
 import androidx.compose.material.icons.rounded.Smartphone
 import androidx.compose.material.icons.rounded.Star
 import androidx.compose.material3.Icon
@@ -34,6 +33,7 @@ import com.zaneschepke.wireguardautotunnel.ui.common.navigation.LocalNavControll
 import com.zaneschepke.wireguardautotunnel.ui.common.snackbar.SnackbarController
 import com.zaneschepke.wireguardautotunnel.util.extensions.asColor
 import com.zaneschepke.wireguardautotunnel.util.extensions.isRunningOnTv
+import com.zaneschepke.wireguardautotunnel.util.extensions.scaledHeight
 
 @Composable
 fun TunnelRowItem(
@@ -56,17 +56,20 @@ fun TunnelRowItem(
 	val itemFocusRequester = remember { FocusRequester() }
 	ExpandingRowListItem(
 		leading = {
-			val icon = when {
-				tunnel.isPrimaryTunnel -> Icons.Rounded.Star
-				tunnel.isMobileDataTunnel -> Icons.Rounded.Smartphone
-				tunnel.isEthernetTunnel -> Icons.Rounded.SettingsEthernet
-				else -> Icons.Rounded.Circle
-			}
+			val circleIcon = Icons.Rounded.Circle
+			val icon =
+				if (tunnel.isPrimaryTunnel) {
+					Icons.Rounded.Star
+				} else if (tunnel.isMobileDataTunnel) {
+					Icons.Rounded.Smartphone
+				} else {
+					circleIcon
+				}
 			Icon(
 				icon,
 				icon.name,
 				tint = leadingIconColor,
-				modifier = Modifier.size(16.dp),
+				modifier = Modifier.size(16.dp.scaledHeight()),
 			)
 		},
 		text = tunnel.name,
@@ -95,7 +98,7 @@ fun TunnelRowItem(
 					IconButton(
 						onClick = {
 							navController.navigate(
-								Route.TunnelOptions(tunnel.id),
+								Route.Option(tunnel.id),
 							)
 						},
 					) {
@@ -128,7 +131,7 @@ fun TunnelRowItem(
 							onClick = {
 								onHold()
 								navController.navigate(
-									Route.TunnelOptions(tunnel.id),
+									Route.Option(tunnel.id),
 								)
 							},
 						) {

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/main/components/TunnelStatisticsRow.kt

@@ -21,21 +21,22 @@ import com.zaneschepke.wireguardautotunnel.util.extensions.toThreeDecimalPlaceSt
 @Composable
 fun TunnelStatisticsRow(statistics: TunnelStatistics?, tunnelConfig: TunnelConfig) {
 	val config = TunnelConfig.configFromAmQuick(tunnelConfig.wgQuick)
-	config.peers.forEach { peer ->
-		Row(
-			modifier =
-			Modifier
-				.fillMaxWidth()
-				.padding(end = 10.dp, bottom = 10.dp, start = 45.dp),
-			verticalAlignment = Alignment.CenterVertically,
-			horizontalArrangement = Arrangement.spacedBy(5.dp, Alignment.Start),
-		) {
-			val peerId = peer.publicKey.toBase64().subSequence(0, 3).toString() + "***"
-			val peerRx = statistics?.peerStats(peer.publicKey)?.rxBytes ?: 0
-			val peerTx = statistics?.peerStats(peer.publicKey)?.txBytes ?: 0
+
+	Row(
+		modifier =
+		Modifier
+			.fillMaxWidth()
+			.padding(end = 10.dp, bottom = 10.dp, start = 45.dp),
+		verticalAlignment = Alignment.CenterVertically,
+		horizontalArrangement = Arrangement.spacedBy(30.dp, Alignment.Start),
+	) {
+		config.peers.forEach {
+			val peerId = it.publicKey.toBase64().subSequence(0, 3).toString() + "***"
+			val peerRx = statistics?.peerStats(it.publicKey)?.rxBytes ?: 0
+			val peerTx = statistics?.peerStats(it.publicKey)?.txBytes ?: 0
 			val peerTxMB = NumberUtils.bytesToMB(peerTx).toThreeDecimalPlaceString()
 			val peerRxMB = NumberUtils.bytesToMB(peerRx).toThreeDecimalPlaceString()
-			val handshake = statistics?.peerStats(peer.publicKey)?.latestHandshakeEpochMillis?.let {
+			val handshake = statistics?.peerStats(it.publicKey)?.latestHandshakeEpochMillis?.let {
 				if (it == 0L) {
 					stringResource(R.string.never)
 				} else {
@@ -55,11 +56,7 @@ fun TunnelStatisticsRow(statistics: TunnelStatistics?, tunnelConfig: TunnelConfi
 			Column(
 				verticalArrangement = Arrangement.spacedBy(10.dp),
 			) {
-				Text(
-					stringResource(R.string.handshake) + ": $handshake",
-					style = MaterialTheme.typography.bodySmall,
-					color = MaterialTheme.colorScheme.outline,
-				)
+				Text(stringResource(R.string.handshake) + ": $handshake", style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.outline)
 				Text("rx: $peerRxMB MB", style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.outline)
 			}
 		}

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/main/components/VpnDeniedDialog.kt

@@ -1,4 +1,4 @@
-package com.zaneschepke.wireguardautotunnel.ui.common.permission.vpn
+package com.zaneschepke.wireguardautotunnel.ui.screens.main.components
 
 import androidx.compose.foundation.text.ClickableText
 import androidx.compose.material3.MaterialTheme

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/options/OptionsScreen.kt

@@ -0,0 +1,197 @@
+package com.zaneschepke.wireguardautotunnel.ui.screens.options
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.ExperimentalLayoutApi
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.Edit
+import androidx.compose.material.icons.outlined.NetworkPing
+import androidx.compose.material.icons.outlined.PhoneAndroid
+import androidx.compose.material.icons.outlined.Security
+import androidx.compose.material.icons.outlined.Star
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import androidx.hilt.navigation.compose.hiltViewModel
+import com.zaneschepke.wireguardautotunnel.R
+import com.zaneschepke.wireguardautotunnel.ui.AppUiState
+import com.zaneschepke.wireguardautotunnel.ui.Route
+import com.zaneschepke.wireguardautotunnel.ui.common.button.ScaledSwitch
+import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SelectionItem
+import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SurfaceSelectionGroupButton
+import com.zaneschepke.wireguardautotunnel.ui.common.label.GroupLabel
+import com.zaneschepke.wireguardautotunnel.ui.common.navigation.LocalNavController
+import com.zaneschepke.wireguardautotunnel.ui.common.navigation.TopNavBar
+import com.zaneschepke.wireguardautotunnel.ui.screens.settings.autotunnel.components.TrustedNetworkTextBox
+import com.zaneschepke.wireguardautotunnel.ui.screens.settings.autotunnel.components.WildcardsLabel
+import com.zaneschepke.wireguardautotunnel.ui.theme.iconSize
+import com.zaneschepke.wireguardautotunnel.util.extensions.scaledHeight
+import com.zaneschepke.wireguardautotunnel.util.extensions.scaledWidth
+
+@OptIn(ExperimentalLayoutApi::class)
+@Composable
+fun OptionsScreen(optionsViewModel: OptionsViewModel = hiltViewModel(), appUiState: AppUiState, tunnelId: Int) {
+	val navController = LocalNavController.current
+	val config = appUiState.tunnels.first { it.id == tunnelId }
+
+	var currentText by remember { mutableStateOf("") }
+
+	LaunchedEffect(config.tunnelNetworks) {
+		currentText = ""
+	}
+	Scaffold(
+		topBar = {
+			TopNavBar(config.name, trailing = {
+				IconButton(onClick = {
+					navController.navigate(
+						Route.Config(config.id),
+					)
+				}) {
+					val icon = Icons.Outlined.Edit
+					Icon(
+						imageVector = icon,
+						contentDescription = icon.name,
+					)
+				}
+			})
+		},
+	) {
+		Column(
+			horizontalAlignment = Alignment.Start,
+			verticalArrangement = Arrangement.spacedBy(24.dp.scaledHeight(), Alignment.Top),
+			modifier =
+			Modifier
+				.fillMaxSize()
+				.padding(it)
+				.padding(top = 24.dp.scaledHeight())
+				.padding(horizontal = 24.dp.scaledWidth()),
+		) {
+			GroupLabel(stringResource(R.string.auto_tunneling))
+			SurfaceSelectionGroupButton(
+				listOf(
+					SelectionItem(
+						Icons.Outlined.Star,
+						title = {
+							Text(
+								stringResource(R.string.primary_tunnel),
+								style = MaterialTheme.typography.bodyMedium.copy(MaterialTheme.colorScheme.onSurface),
+							)
+						},
+						description = {
+							Text(
+								stringResource(R.string.set_primary_tunnel),
+								style = MaterialTheme.typography.bodyMedium.copy(MaterialTheme.colorScheme.outline),
+							)
+						},
+						trailing = {
+							ScaledSwitch(
+								config.isPrimaryTunnel,
+								onClick = { optionsViewModel.onTogglePrimaryTunnel(config) },
+							)
+						},
+						onClick = { optionsViewModel.onTogglePrimaryTunnel(config) },
+					),
+					SelectionItem(
+						Icons.Outlined.PhoneAndroid,
+						title = { Text(stringResource(R.string.mobile_tunnel), style = MaterialTheme.typography.bodyMedium.copy(MaterialTheme.colorScheme.onSurface)) },
+						description = {
+							Text(
+								stringResource(R.string.mobile_data_tunnel),
+								style = MaterialTheme.typography.bodyMedium.copy(MaterialTheme.colorScheme.outline),
+							)
+						},
+						trailing = {
+							ScaledSwitch(
+								config.isMobileDataTunnel,
+								onClick = { optionsViewModel.onToggleIsMobileDataTunnel(config) },
+							)
+						},
+						onClick = { optionsViewModel.onToggleIsMobileDataTunnel(config) },
+					),
+					SelectionItem(
+						Icons.Outlined.NetworkPing,
+						title = {
+							Text(
+								stringResource(R.string.restart_on_ping),
+								style = MaterialTheme.typography.bodyMedium.copy(MaterialTheme.colorScheme.onSurface),
+							)
+						},
+						trailing = {
+							ScaledSwitch(
+								checked = config.isPingEnabled,
+								onClick = { optionsViewModel.onToggleRestartOnPing(config) },
+							)
+						},
+						onClick = { optionsViewModel.onToggleRestartOnPing(config) },
+					),
+					SelectionItem(
+						title = {
+							Row(
+								verticalAlignment = Alignment.CenterVertically,
+								modifier = Modifier.fillMaxWidth().padding(vertical = 4.dp.scaledHeight()),
+							) {
+								Row(
+									verticalAlignment = Alignment.CenterVertically,
+									modifier = Modifier
+										.weight(4f, false)
+										.fillMaxWidth(),
+								) {
+									val icon = Icons.Outlined.Security
+									Icon(
+										icon,
+										icon.name,
+										modifier = Modifier.size(iconSize),
+									)
+									Column(
+										horizontalAlignment = Alignment.Start,
+										verticalArrangement = Arrangement.spacedBy(2.dp, Alignment.CenterVertically),
+										modifier = Modifier
+											.fillMaxWidth()
+											.padding(start = 16.dp.scaledWidth())
+											.padding(vertical = 6.dp.scaledHeight()),
+									) {
+										Text(
+											stringResource(R.string.use_tunnel_on_wifi_name),
+											style = MaterialTheme.typography.bodyMedium.copy(MaterialTheme.colorScheme.onSurface),
+										)
+									}
+								}
+							}
+						},
+						description = {
+							TrustedNetworkTextBox(
+								config.tunnelNetworks,
+								onDelete = { optionsViewModel.onDeleteRunSSID(it, config) },
+								currentText = currentText,
+								onSave = { optionsViewModel.onSaveRunSSID(it, config) },
+								onValueChange = { currentText = it },
+								supporting = {
+									if (appUiState.settings.isWildcardsEnabled) {
+										WildcardsLabel()
+									}
+								},
+							)
+						},
+					),
+				),
+			)
+		}
+	}
+}

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/options/OptionsViewModel.kt

@@ -1,4 +1,4 @@
-package com.zaneschepke.wireguardautotunnel.ui.screens.tunneloptions
+package com.zaneschepke.wireguardautotunnel.ui.screens.options
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
@@ -12,7 +12,7 @@ import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 @HiltViewModel
-class TunnelOptionsViewModel
+class OptionsViewModel
 @Inject
 constructor(
 	private val appDataRepository: AppDataRepository,
@@ -77,12 +77,4 @@ constructor(
 			),
 		)
 	}
-
-	fun onToggleIsEthernetTunnel(tunnelConfig: TunnelConfig) = viewModelScope.launch {
-		if (tunnelConfig.isEthernetTunnel) {
-			appDataRepository.tunnels.updateEthernetTunnel(null)
-		} else {
-			appDataRepository.tunnels.updateEthernetTunnel(tunnelConfig)
-		}
-	}
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/scanner/ScannerScreen.kt

@@ -9,9 +9,11 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.viewinterop.AndroidView
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import com.google.accompanist.permissions.ExperimentalPermissionsApi
 import com.journeyapps.barcodescanner.CompoundBarcodeView
 import com.zaneschepke.wireguardautotunnel.ui.common.navigation.LocalNavController
 
+@OptIn(ExperimentalPermissionsApi::class)
 @Composable
 fun ScannerScreen(viewModel: ScannerViewModel = hiltViewModel()) {
 	val context = LocalContext.current

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/scanner/ScannerViewModel.kt

@@ -9,6 +9,7 @@ import com.zaneschepke.wireguardautotunnel.module.IoDispatcher
 import com.zaneschepke.wireguardautotunnel.ui.common.snackbar.SnackbarController
 import com.zaneschepke.wireguardautotunnel.util.NumberUtils
 import com.zaneschepke.wireguardautotunnel.util.StringValue
+import com.zaneschepke.wireguardautotunnel.util.extensions.toWgQuickString
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.flow.MutableSharedFlow
@@ -44,7 +45,10 @@ constructor(
 	fun onTunnelQrResult(result: String) = viewModelScope.launch(ioDispatcher) {
 		kotlin.runCatching {
 			val amConfig = TunnelConfig.configFromAmQuick(result)
-			val tunnelConfig = TunnelConfig.tunnelConfigFromAmConfig(amConfig, makeTunnelNameUnique(generateQrCodeDefaultName(result)))
+			val amQuick = amConfig.toAwgQuickString(true)
+			val wgQuick = amConfig.toWgQuickString()
+			val tunnelName = makeTunnelNameUnique(generateQrCodeDefaultName(result))
+			val tunnelConfig = TunnelConfig(name = tunnelName, wgQuick = wgQuick, amQuick = amQuick)
 			appDataRepository.tunnels.save(tunnelConfig)
 			_success.emit(true)
 		}.onFailure {

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/settings/SettingsScreen.kt

@@ -7,21 +7,19 @@ import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.ExperimentalLayoutApi
 import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.imePadding
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.systemBarsPadding
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.outlined.ViewQuilt
 import androidx.compose.material.icons.filled.AppShortcut
+import androidx.compose.material.icons.outlined.AdminPanelSettings
 import androidx.compose.material.icons.outlined.Bolt
 import androidx.compose.material.icons.outlined.Code
 import androidx.compose.material.icons.outlined.FolderZip
 import androidx.compose.material.icons.outlined.Notifications
 import androidx.compose.material.icons.outlined.Pin
 import androidx.compose.material.icons.outlined.Restore
-import androidx.compose.material.icons.outlined.VpnKeyOff
 import androidx.compose.material.icons.outlined.VpnLock
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
@@ -32,11 +30,13 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.focus.focusRequester
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalFocusManager
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
+import com.google.accompanist.permissions.ExperimentalPermissionsApi
 import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.service.tunnel.TunnelState
 import com.zaneschepke.wireguardautotunnel.ui.AppUiState
@@ -45,24 +45,31 @@ import com.zaneschepke.wireguardautotunnel.ui.Route
 import com.zaneschepke.wireguardautotunnel.ui.common.button.ScaledSwitch
 import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SelectionItem
 import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SurfaceSelectionGroupButton
+import com.zaneschepke.wireguardautotunnel.ui.common.navigation.LocalFocusRequester
 import com.zaneschepke.wireguardautotunnel.ui.common.navigation.LocalNavController
 import com.zaneschepke.wireguardautotunnel.ui.common.prompt.AuthorizationPrompt
 import com.zaneschepke.wireguardautotunnel.ui.common.snackbar.SnackbarController
 import com.zaneschepke.wireguardautotunnel.ui.screens.settings.components.ForwardButton
+import com.zaneschepke.wireguardautotunnel.ui.theme.topPadding
 import com.zaneschepke.wireguardautotunnel.util.extensions.isRunningOnTv
 import com.zaneschepke.wireguardautotunnel.util.extensions.launchNotificationSettings
+import com.zaneschepke.wireguardautotunnel.util.extensions.launchVpnSettings
 import com.zaneschepke.wireguardautotunnel.util.extensions.scaledHeight
 import com.zaneschepke.wireguardautotunnel.util.extensions.scaledWidth
 import com.zaneschepke.wireguardautotunnel.util.extensions.showToast
 import xyz.teamgravity.pin_lock_compose.PinManager
 
-@OptIn(ExperimentalLayoutApi::class)
+@OptIn(
+	ExperimentalPermissionsApi::class,
+	ExperimentalLayoutApi::class,
+)
 @Composable
 fun SettingsScreen(viewModel: SettingsViewModel = hiltViewModel(), appViewModel: AppViewModel, uiState: AppUiState) {
 	val context = LocalContext.current
 	val navController = LocalNavController.current
 	val focusManager = LocalFocusManager.current
 	val snackbar = SnackbarController.current
+	val rootFocusRequester = LocalFocusRequester.current
 	val isRunningOnTv = remember { context.isRunningOnTv() }
 
 	val interactionSource = remember { MutableInteractionSource() }
@@ -95,8 +102,8 @@ fun SettingsScreen(viewModel: SettingsViewModel = hiltViewModel(), appViewModel:
 		modifier =
 		Modifier
 			.verticalScroll(rememberScrollState())
-			.fillMaxSize().systemBarsPadding().imePadding()
-			.padding(top = 24.dp.scaledHeight())
+			.fillMaxSize()
+			.padding(top = topPadding)
 			.padding(bottom = 40.dp.scaledHeight())
 			.padding(horizontal = 24.dp.scaledWidth())
 			.then(
@@ -128,84 +135,81 @@ fun SettingsScreen(viewModel: SettingsViewModel = hiltViewModel(), appViewModel:
 						navController.navigate(Route.AutoTunnel)
 					},
 					trailing = {
-						ForwardButton(Modifier.focusable()) { navController.navigate(Route.AutoTunnel) }
+						ForwardButton(Modifier.focusable().focusRequester(rootFocusRequester)) { navController.navigate(Route.AutoTunnel) }
 					},
 				),
 			),
 		)
 		SurfaceSelectionGroupButton(
 			buildList {
-				add(
-					SelectionItem(
-						Icons.Filled.AppShortcut,
-						{
-							ScaledSwitch(
-								uiState.settings.isShortcutsEnabled,
-								onClick = { appViewModel.onToggleShortcutsEnabled() },
-							)
-						},
-						title = {
-							Text(
-								stringResource(R.string.enabled_app_shortcuts),
-								style = MaterialTheme.typography.bodyMedium.copy(MaterialTheme.colorScheme.onSurface),
-							)
-						},
-						onClick = { appViewModel.onToggleShortcutsEnabled() },
-					),
-				)
 				if (!isRunningOnTv) {
-					add(
-						SelectionItem(
-							Icons.Outlined.VpnLock,
-							{
-								ScaledSwitch(
-									enabled = !(
-										(
-											uiState.settings.isTunnelOnWifiEnabled ||
-												uiState.settings.isTunnelOnEthernetEnabled ||
-												uiState.settings.isTunnelOnMobileDataEnabled
-											) &&
-											uiState.settings.isAutoTunnelEnabled
-										),
-									onClick = { appViewModel.onToggleAlwaysOnVPN() },
-									checked = uiState.settings.isAlwaysOnVpnEnabled,
-								)
-							},
-							title = {
-								Text(
-									stringResource(R.string.always_on_vpn_support),
-									style = MaterialTheme.typography.bodyMedium.copy(MaterialTheme.colorScheme.onSurface),
-								)
-							},
-							onClick = { appViewModel.onToggleAlwaysOnVPN() },
+					addAll(
+						listOf(
+							SelectionItem(
+								Icons.Filled.AppShortcut,
+								{
+									ScaledSwitch(
+										uiState.settings.isShortcutsEnabled,
+										onClick = { viewModel.onToggleShortcutsEnabled() },
+									)
+								},
+								title = {
+									Text(
+										stringResource(R.string.enabled_app_shortcuts),
+										style = MaterialTheme.typography.bodyMedium.copy(MaterialTheme.colorScheme.onSurface),
+									)
+								},
+								onClick = { viewModel.onToggleShortcutsEnabled() },
+							),
+							SelectionItem(
+								Icons.Outlined.VpnLock,
+								{
+									ScaledSwitch(
+										enabled = !(
+											(
+												uiState.settings.isTunnelOnWifiEnabled ||
+													uiState.settings.isTunnelOnEthernetEnabled ||
+													uiState.settings.isTunnelOnMobileDataEnabled
+												) &&
+												uiState.settings.isAutoTunnelEnabled
+											),
+										onClick = { viewModel.onToggleAlwaysOnVPN() },
+										checked = uiState.settings.isAlwaysOnVpnEnabled,
+									)
+								},
+								title = {
+									Text(
+										stringResource(R.string.always_on_vpn_support),
+										style = MaterialTheme.typography.bodyMedium.copy(MaterialTheme.colorScheme.onSurface),
+									)
+								},
+								onClick = { viewModel.onToggleAlwaysOnVPN() },
+							),
+							SelectionItem(
+								Icons.Outlined.AdminPanelSettings,
+								title = {
+									Text(
+										stringResource(R.string.kill_switch),
+										style = MaterialTheme.typography.bodyMedium.copy(MaterialTheme.colorScheme.onSurface),
+									)
+								},
+								onClick = {
+									context.launchVpnSettings()
+								},
+								trailing = {
+									ForwardButton { context.launchVpnSettings() }
+								},
+							),
 						),
 					)
 				}
-				add(
-					SelectionItem(
-						Icons.Outlined.VpnKeyOff,
-						title = {
-							Text(
-								stringResource(R.string.kill_switch_options),
-								style = MaterialTheme.typography.bodyMedium.copy(MaterialTheme.colorScheme.onSurface),
-							)
-						},
-						onClick = {
-							navController.navigate(Route.KillSwitch)
-						},
-						trailing = {
-							ForwardButton { navController.navigate(Route.KillSwitch) }
-						},
-					),
-				)
-
 				add(
 					SelectionItem(
 						Icons.Outlined.Restore,
 						{
 							ScaledSwitch(
 								uiState.settings.isRestoreOnBootEnabled,
-								onClick = { appViewModel.onToggleRestartAtBoot() },
+								onClick = { viewModel.onToggleRestartAtBoot() },
 							)
 						},
 						title = {
@@ -214,7 +218,7 @@ fun SettingsScreen(viewModel: SettingsViewModel = hiltViewModel(), appViewModel:
 								style = MaterialTheme.typography.bodyMedium.copy(MaterialTheme.colorScheme.onSurface),
 							)
 						},
-						onClick = { appViewModel.onToggleRestartAtBoot() },
+						onClick = { viewModel.onToggleRestartAtBoot() },
 					),
 				)
 			},
@@ -290,7 +294,7 @@ fun SettingsScreen(viewModel: SettingsViewModel = hiltViewModel(), appViewModel:
 						trailing = {
 							ScaledSwitch(
 								uiState.settings.isKernelEnabled,
-								onClick = { appViewModel.onToggleKernelMode() },
+								onClick = { viewModel.onToggleKernelMode() },
 								enabled = !(
 									uiState.settings.isAutoTunnelEnabled ||
 										uiState.settings.isAlwaysOnVpnEnabled ||
@@ -299,7 +303,7 @@ fun SettingsScreen(viewModel: SettingsViewModel = hiltViewModel(), appViewModel:
 							)
 						},
 						onClick = {
-							appViewModel.onToggleKernelMode()
+							viewModel.onToggleKernelMode()
 						},
 					),
 				),

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/settings/SettingsViewModel.kt

@@ -4,23 +4,118 @@ import android.content.Context
 import androidx.core.content.FileProvider
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
+import com.wireguard.android.backend.WgQuickBackend
+import com.wireguard.android.util.RootShell
 import com.zaneschepke.wireguardautotunnel.R
+import com.zaneschepke.wireguardautotunnel.data.domain.Settings
 import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
+import com.zaneschepke.wireguardautotunnel.module.IoDispatcher
+import com.zaneschepke.wireguardautotunnel.ui.common.snackbar.SnackbarController
 import com.zaneschepke.wireguardautotunnel.util.FileUtils
+import com.zaneschepke.wireguardautotunnel.util.StringValue
 import com.zaneschepke.wireguardautotunnel.util.extensions.launchShareFile
 import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import java.time.Instant
 import javax.inject.Inject
+import javax.inject.Provider
 
 @HiltViewModel
 class SettingsViewModel
 @Inject
 constructor(
 	private val appDataRepository: AppDataRepository,
+	private val rootShell: Provider<RootShell>,
 	private val fileUtils: FileUtils,
+	@IoDispatcher private val ioDispatcher: CoroutineDispatcher,
 ) : ViewModel() {
 
+	private val settings = appDataRepository.settings.getSettingsFlow()
+		.stateIn(viewModelScope, SharingStarted.Eagerly, Settings())
+
+	fun setLocationDisclosureShown() = viewModelScope.launch {
+		appDataRepository.appState.setLocationDisclosureShown(true)
+	}
+
+	fun onToggleAlwaysOnVPN() = viewModelScope.launch {
+		with(settings.value) {
+			appDataRepository.settings.save(
+				copy(
+					isAlwaysOnVpnEnabled = !isAlwaysOnVpnEnabled,
+				),
+			)
+		}
+	}
+
+	fun onToggleShortcutsEnabled() = viewModelScope.launch {
+		with(settings.value) {
+			appDataRepository.settings.save(
+				this.copy(
+					isShortcutsEnabled = !isShortcutsEnabled,
+				),
+			)
+		}
+	}
+
+	private fun saveKernelMode(enabled: Boolean) = viewModelScope.launch {
+		with(settings.value) {
+			appDataRepository.settings.save(
+				this.copy(
+					isKernelEnabled = enabled,
+				),
+			)
+		}
+	}
+
+	fun onToggleKernelMode() = viewModelScope.launch {
+		with(settings.value) {
+			if (!isKernelEnabled) {
+				requestRoot().onSuccess {
+					if (!isKernelSupported()) return@onSuccess SnackbarController.showMessage(StringValue.StringResource(R.string.kernel_not_supported))
+					appDataRepository.settings.save(
+						copy(
+							isKernelEnabled = true,
+							isAmneziaEnabled = false,
+						),
+					)
+				}
+			} else {
+				saveKernelMode(enabled = false)
+			}
+		}
+	}
+
+	private suspend fun isKernelSupported(): Boolean {
+		return withContext(ioDispatcher) {
+			WgQuickBackend.hasKernelSupport()
+		}
+	}
+
+	fun onToggleRestartAtBoot() = viewModelScope.launch {
+		with(settings.value) {
+			appDataRepository.settings.save(
+				copy(
+					isRestoreOnBootEnabled = !isRestoreOnBootEnabled,
+				),
+			)
+		}
+	}
+
+	private suspend fun requestRoot(): Result<Unit> {
+		return withContext(ioDispatcher) {
+			kotlin.runCatching {
+				rootShell.get().start()
+				SnackbarController.showMessage(StringValue.StringResource(R.string.root_accepted))
+			}.onFailure {
+				SnackbarController.showMessage(StringValue.StringResource(R.string.error_root_denied))
+			}
+		}
+	}
+
 	fun exportAllConfigs(context: Context) = viewModelScope.launch {
 		kotlin.runCatching {
 			val shareFile = fileUtils.createNewShareFile("wg-export_${Instant.now().epochSecond}.zip")

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/settings/appearance/AppearanceScreen.kt

@@ -6,7 +6,6 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.Contrast
-import androidx.compose.material.icons.outlined.Notifications
 import androidx.compose.material.icons.outlined.Translate
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
@@ -14,7 +13,6 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import com.zaneschepke.wireguardautotunnel.R
@@ -24,14 +22,12 @@ import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SurfaceSelec
 import com.zaneschepke.wireguardautotunnel.ui.common.navigation.LocalNavController
 import com.zaneschepke.wireguardautotunnel.ui.common.navigation.TopNavBar
 import com.zaneschepke.wireguardautotunnel.ui.screens.settings.components.ForwardButton
-import com.zaneschepke.wireguardautotunnel.util.extensions.launchNotificationSettings
 import com.zaneschepke.wireguardautotunnel.util.extensions.scaledHeight
 import com.zaneschepke.wireguardautotunnel.util.extensions.scaledWidth
 
 @Composable
 fun AppearanceScreen() {
 	val navController = LocalNavController.current
-	val context = LocalContext.current
 
 	Scaffold(
 		topBar = {
@@ -59,20 +55,6 @@ fun AppearanceScreen() {
 					),
 				),
 			)
-			SurfaceSelectionGroupButton(
-				listOf(
-					SelectionItem(
-						Icons.Outlined.Notifications,
-						title = { Text(stringResource(R.string.notifications), style = MaterialTheme.typography.bodyMedium.copy(MaterialTheme.colorScheme.onSurface)) },
-						onClick = {
-							context.launchNotificationSettings()
-						},
-						trailing = {
-							ForwardButton { context.launchNotificationSettings() }
-						},
-					),
-				),
-			)
 			SurfaceSelectionGroupButton(
 				listOf(
 					SelectionItem(

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/settings/appearance/language/LanguageScreen.kt

@@ -2,33 +2,48 @@ package com.zaneschepke.wireguardautotunnel.ui.screens.settings.appearance.langu
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.navigationBars
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.windowInsetsPadding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.material3.Scaffold
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.ui.AppUiState
-import com.zaneschepke.wireguardautotunnel.ui.AppViewModel
+import com.zaneschepke.wireguardautotunnel.data.datastore.LocaleStorage
+import com.zaneschepke.wireguardautotunnel.ui.Route
 import com.zaneschepke.wireguardautotunnel.ui.common.SelectedLabel
 import com.zaneschepke.wireguardautotunnel.ui.common.button.SelectionItemButton
+import com.zaneschepke.wireguardautotunnel.ui.common.navigation.LocalNavController
 import com.zaneschepke.wireguardautotunnel.ui.common.navigation.TopNavBar
 import com.zaneschepke.wireguardautotunnel.util.LocaleUtil
+import com.zaneschepke.wireguardautotunnel.util.extensions.navigateAndForget
 import com.zaneschepke.wireguardautotunnel.util.extensions.scaledHeight
 import com.zaneschepke.wireguardautotunnel.util.extensions.scaledWidth
+import timber.log.Timber
 import java.text.Collator
 import java.util.Locale
 
 @Composable
-fun LanguageScreen(appUiState: AppUiState, appViewModel: AppViewModel) {
+fun LanguageScreen(localeStorage: LocaleStorage) {
+	val navController = LocalNavController.current
+
+	val context = LocalContext.current
+
 	val collator = Collator.getInstance(Locale.getDefault())
 
+	val currentLocale = remember { mutableStateOf(LocaleUtil.OPTION_PHONE_LANGUAGE) }
+
 	val locales = LocaleUtil.supportedLocales.map {
 		val tag = it.replace("_", "-")
 		Locale.forLanguageTag(tag)
@@ -39,31 +54,40 @@ fun LanguageScreen(appUiState: AppUiState, appViewModel: AppViewModel) {
 			locales.sortedWith(compareBy(collator) { it.getDisplayName(it) }).toList()
 		}
 
+	LaunchedEffect(Unit) {
+		currentLocale.value = localeStorage.getPreferredLocale()
+	}
+
+	fun onChangeLocale(locale: String) {
+		Timber.d("Setting preferred locale: $locale")
+		localeStorage.setPreferredLocale(locale)
+		LocaleUtil.applyLocalizedContext(context, locale)
+		navController.navigateAndForget(Route.Main)
+	}
+
 	Scaffold(
 		topBar = {
 			TopNavBar(stringResource(R.string.language))
 		},
-	) { padding ->
+	) {
 		LazyColumn(
 			horizontalAlignment = Alignment.CenterHorizontally,
 			verticalArrangement = Arrangement.Top,
 			modifier =
 			Modifier
-				.fillMaxSize().padding(padding)
-				.padding(horizontal = 24.dp.scaledWidth()),
+				.fillMaxSize().padding(it)
+				.padding(horizontal = 24.dp.scaledWidth()).windowInsetsPadding(WindowInsets.navigationBars),
 		) {
 			item {
 				Box(modifier = Modifier.padding(top = 24.dp.scaledHeight())) {
 					SelectionItemButton(
 						buttonText = stringResource(R.string.automatic),
 						onClick = {
-							appViewModel.onLocaleChange(LocaleUtil.OPTION_PHONE_LANGUAGE)
+							onChangeLocale(LocaleUtil.OPTION_PHONE_LANGUAGE)
 						},
 						trailing = {
-							with(appUiState.generalState.locale) {
-								if (this == LocaleUtil.OPTION_PHONE_LANGUAGE || this == null) {
-									SelectedLabel()
-								}
+							if (currentLocale.value == LocaleUtil.OPTION_PHONE_LANGUAGE) {
+								SelectedLabel()
 							}
 						},
 						ripple = false,
@@ -72,18 +96,13 @@ fun LanguageScreen(appUiState: AppUiState, appViewModel: AppViewModel) {
 			}
 			items(sortedLocales, key = { it }) { locale ->
 				SelectionItemButton(
-					buttonText = locale.getDisplayLanguage(locale).replaceFirstChar { if (it.isLowerCase()) it.titlecase(locale) else it.toString() } +
-						if (locale.toLanguageTag().contains("-")) {
-							" (${locale.getDisplayCountry(locale)
-								.replaceFirstChar { if (it.isLowerCase()) it.titlecase(locale) else it.toString() }})"
-						} else {
-							""
-						},
+					buttonText = locale.getDisplayLanguage(locale).capitalize(locale) +
+						if (locale.toLanguageTag().contains("-")) " (${locale.getDisplayCountry(locale).capitalize(locale)})" else "",
 					onClick = {
-						appViewModel.onLocaleChange(locale.toLanguageTag())
+						onChangeLocale(locale.toLanguageTag())
 					},
 					trailing = {
-						if (locale.toLanguageTag() == appUiState.generalState.locale) {
+						if (locale.toLanguageTag() == currentLocale.value) {
 							SelectedLabel()
 						}
 					},

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/settings/autotunnel/AutoTunnelScreen.kt

@@ -6,14 +6,12 @@ import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.ExperimentalLayoutApi
 import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.rememberScrollState
-import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.outlined.AirplanemodeActive
 import androidx.compose.material.icons.outlined.Code
 import androidx.compose.material.icons.outlined.Filter1
 import androidx.compose.material.icons.outlined.NetworkPing
@@ -73,18 +71,16 @@ fun AutoTunnelScreen(uiState: AppUiState, viewModel: AutoTunnelViewModel = hiltV
 		isBackgroundLocationGranted = fineLocationState.status.isGranted
 	}
 
-	fun isWifiNameReadable(): Boolean {
-		return when {
-			!isBackgroundLocationGranted ||
-				!fineLocationState.status.isGranted -> {
-				showLocationDialog = true
-				false
-			}
-			!context.isLocationServicesEnabled() -> {
+	fun onAutoTunnelWifiChecked() {
+		if (uiState.settings.isTunnelOnWifiEnabled) viewModel.onToggleTunnelOnWifi().also { return }
+		when (false) {
+			isBackgroundLocationGranted -> showLocationDialog = true
+			fineLocationState.status.isGranted -> showLocationDialog = true
+			context.isLocationServicesEnabled() ->
 				showLocationServicesAlertDialog = true
-				false
+			else -> {
+				viewModel.onToggleTunnelOnWifi()
 			}
-			else -> true
 		}
 	}
 
@@ -106,7 +102,7 @@ fun AutoTunnelScreen(uiState: AppUiState, viewModel: AutoTunnelViewModel = hiltV
 		showLocationServicesAlertDialog,
 		onDismiss = { showLocationServicesAlertDialog = false },
 		onAttest = {
-			showLocationServicesAlertDialog = false
+			viewModel.onToggleTunnelOnWifi()
 		},
 	)
 
@@ -117,18 +113,18 @@ fun AutoTunnelScreen(uiState: AppUiState, viewModel: AutoTunnelViewModel = hiltV
 	)
 
 	Scaffold(
+		contentWindowInsets = WindowInsets(0.dp),
 		topBar = {
 			TopNavBar(stringResource(R.string.auto_tunneling))
 		},
-	) { padding ->
+	) {
 		Column(
 			horizontalAlignment = Alignment.Start,
 			verticalArrangement = Arrangement.spacedBy(24.dp.scaledHeight(), Alignment.Top),
 			modifier =
 			Modifier
 				.fillMaxSize()
-				.padding(padding)
-				.verticalScroll(rememberScrollState())
+				.padding(it)
 				.padding(top = 24.dp.scaledHeight())
 				.padding(horizontal = 24.dp.scaledWidth()),
 		) {
@@ -151,12 +147,14 @@ fun AutoTunnelScreen(uiState: AppUiState, viewModel: AutoTunnelViewModel = hiltV
 										enabled = !uiState.settings.isAlwaysOnVpnEnabled,
 										checked = uiState.settings.isTunnelOnWifiEnabled,
 										onClick = {
-											viewModel.onToggleTunnelOnWifi()
+											if (uiState.settings.isWifiNameByShellEnabled) viewModel.onToggleTunnelOnWifi().also { return@ScaledSwitch }
+											onAutoTunnelWifiChecked()
 										},
 									)
 								},
 								onClick = {
-									viewModel.onToggleTunnelOnWifi()
+									if (uiState.settings.isWifiNameByShellEnabled) viewModel.onToggleTunnelOnWifi().also { return@SelectionItem }
+									onAutoTunnelWifiChecked()
 								},
 							),
 							SelectionItem(
@@ -252,9 +250,7 @@ fun AutoTunnelScreen(uiState: AppUiState, viewModel: AutoTunnelViewModel = hiltV
 											uiState.settings.trustedNetworkSSIDs,
 											onDelete = viewModel::onDeleteTrustedSSID,
 											currentText = currentText,
-											onSave = { ssid ->
-												if (uiState.settings.isWifiNameByShellEnabled || isWifiNameReadable()) viewModel.onSaveTrustedSSID(ssid)
-											},
+											onSave = viewModel::onSaveTrustedSSID,
 											onValueChange = { currentText = it },
 											supporting = {
 												if (uiState.settings.isWildcardsEnabled) {
@@ -327,30 +323,6 @@ fun AutoTunnelScreen(uiState: AppUiState, viewModel: AutoTunnelViewModel = hiltV
 							viewModel.onToggleRestartOnPing()
 						},
 					),
-					SelectionItem(
-						Icons.Outlined.AirplanemodeActive,
-						title = {
-							Text(
-								stringResource(R.string.stop_on_no_internet),
-								style = MaterialTheme.typography.bodyMedium.copy(MaterialTheme.colorScheme.onSurface),
-							)
-						},
-						description = {
-							Text(
-								stringResource(R.string.stop_on_internet_loss),
-								style = MaterialTheme.typography.bodySmall.copy(MaterialTheme.colorScheme.outline),
-							)
-						},
-						trailing = {
-							ScaledSwitch(
-								checked = uiState.settings.isStopOnNoInternetEnabled,
-								onClick = { viewModel.onToggleStopOnNoInternet() },
-							)
-						},
-						onClick = {
-							viewModel.onToggleStopOnNoInternet()
-						},
-					),
 				),
 			)
 		}

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/settings/autotunnel/AutoTunnelViewModel.kt

@@ -6,7 +6,6 @@ import com.wireguard.android.util.RootShell
 import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.data.domain.Settings
 import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
-import com.zaneschepke.wireguardautotunnel.module.AppShell
 import com.zaneschepke.wireguardautotunnel.module.IoDispatcher
 import com.zaneschepke.wireguardautotunnel.ui.common.snackbar.SnackbarController
 import com.zaneschepke.wireguardautotunnel.util.StringValue
@@ -24,7 +23,7 @@ class AutoTunnelViewModel
 @Inject
 constructor(
 	private val appDataRepository: AppDataRepository,
-	@AppShell private val rootShell: Provider<RootShell>,
+	private val rootShell: Provider<RootShell>,
 	@IoDispatcher private val ioDispatcher: CoroutineDispatcher,
 ) : ViewModel() {
 
@@ -128,12 +127,4 @@ constructor(
 			)
 		}
 	}
-
-	fun onToggleStopOnNoInternet() = viewModelScope.launch {
-		with(settings.value) {
-			appDataRepository.settings.save(
-				copy(isStopOnNoInternetEnabled = !isStopOnNoInternetEnabled),
-			)
-		}
-	}
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/settings/autotunnel/components/TrustNetworksTextBox.kt

@@ -1,6 +1,5 @@
 package com.zaneschepke.wireguardautotunnel.ui.screens.settings.autotunnel.components
 
-import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.ExperimentalLayoutApi
@@ -17,7 +16,6 @@ import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
@@ -68,7 +66,6 @@ fun TrustedNetworkTextBox(
 			textStyle = MaterialTheme.typography.bodySmall,
 			value = currentText,
 			onValueChange = onValueChange,
-			interactionSource = remember { MutableInteractionSource() },
 			label = { Text(stringResource(R.string.add_wifi_name)) },
 			containerColor = MaterialTheme.colorScheme.surface,
 			supportingText = supporting,

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/settings/disclosure/LocationDisclosureScreen.kt

@@ -5,7 +5,6 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.systemBarsPadding
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.LocationOn
 import androidx.compose.material.icons.rounded.PermScanWifi
@@ -28,6 +27,7 @@ import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SelectionIte
 import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SurfaceSelectionGroupButton
 import com.zaneschepke.wireguardautotunnel.ui.common.navigation.LocalNavController
 import com.zaneschepke.wireguardautotunnel.ui.screens.settings.components.ForwardButton
+import com.zaneschepke.wireguardautotunnel.ui.theme.topPadding
 import com.zaneschepke.wireguardautotunnel.util.extensions.goFromRoot
 import com.zaneschepke.wireguardautotunnel.util.extensions.launchAppSettings
 import com.zaneschepke.wireguardautotunnel.util.extensions.scaledHeight
@@ -46,8 +46,7 @@ fun LocationDisclosureScreen(appViewModel: AppViewModel, appUiState: AppUiState)
 		horizontalAlignment = Alignment.CenterHorizontally,
 		verticalArrangement = Arrangement.spacedBy(24.dp.scaledHeight(), Alignment.Top),
 		modifier =
-		Modifier.fillMaxSize().systemBarsPadding().padding(top = 24.dp.scaledHeight())
-			.padding(horizontal = 24.dp.scaledWidth()),
+		Modifier.fillMaxSize().padding(top = topPadding).padding(horizontal = 24.dp.scaledWidth()),
 	) {
 		val icon = Icons.Rounded.PermScanWifi
 		Icon(

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/settings/killswitch/KillSwitchScreen.kt

@@ -1,149 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.ui.screens.settings.killswitch
-
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.padding
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.outlined.AdminPanelSettings
-import androidx.compose.material.icons.outlined.Lan
-import androidx.compose.material.icons.outlined.VpnKey
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Scaffold
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.unit.dp
-import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.ui.AppUiState
-import com.zaneschepke.wireguardautotunnel.ui.AppViewModel
-import com.zaneschepke.wireguardautotunnel.ui.common.button.ScaledSwitch
-import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SelectionItem
-import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SurfaceSelectionGroupButton
-import com.zaneschepke.wireguardautotunnel.ui.common.navigation.TopNavBar
-import com.zaneschepke.wireguardautotunnel.ui.common.permission.vpn.withVpnPermission
-import com.zaneschepke.wireguardautotunnel.ui.common.snackbar.SnackbarController
-import com.zaneschepke.wireguardautotunnel.ui.screens.settings.components.ForwardButton
-import com.zaneschepke.wireguardautotunnel.util.StringValue
-import com.zaneschepke.wireguardautotunnel.util.extensions.isRunningOnTv
-import com.zaneschepke.wireguardautotunnel.util.extensions.launchVpnSettings
-import com.zaneschepke.wireguardautotunnel.util.extensions.scaledHeight
-import com.zaneschepke.wireguardautotunnel.util.extensions.scaledWidth
-
-@Composable
-fun KillSwitchScreen(uiState: AppUiState, appViewModel: AppViewModel) {
-	val context = LocalContext.current
-
-	val toggleVpnSwitch = withVpnPermission<Boolean> { appViewModel.onToggleVpnKillSwitch(it) }
-
-	fun toggleVpnKillSwitch() {
-		with(uiState.settings) {
-			// TODO improve this error message
-			if (isKernelEnabled) return SnackbarController.showMessage(StringValue.StringResource(R.string.kernel_not_supported))
-			if (isVpnKillSwitchEnabled) {
-				appViewModel.onToggleVpnKillSwitch(false)
-			} else {
-				toggleVpnSwitch.invoke(true)
-			}
-		}
-	}
-
-	fun toggleLanOnKillSwitch() {
-		with(uiState.settings) {
-			appViewModel.onToggleLanOnKillSwitch(!isLanOnKillSwitchEnabled)
-		}
-	}
-
-	Scaffold(
-		topBar = {
-			TopNavBar(stringResource(R.string.kill_switch))
-		},
-	) { padding ->
-		Column(
-			horizontalAlignment = Alignment.Start,
-			verticalArrangement = Arrangement.spacedBy(24.dp.scaledHeight(), Alignment.Top),
-			modifier =
-			Modifier
-				.fillMaxSize().padding(padding)
-				.padding(top = 24.dp.scaledHeight())
-				.padding(horizontal = 24.dp.scaledWidth()),
-		) {
-			if (!context.isRunningOnTv()) {
-				SurfaceSelectionGroupButton(
-					listOf(
-						SelectionItem(
-							Icons.Outlined.AdminPanelSettings,
-							title = {
-								Text(
-									stringResource(R.string.native_kill_switch),
-									style = MaterialTheme.typography.bodyMedium.copy(MaterialTheme.colorScheme.onSurface),
-								)
-							},
-							onClick = { context.launchVpnSettings() },
-							trailing = {
-								ForwardButton { context.launchVpnSettings() }
-							},
-						),
-					),
-				)
-			}
-			SurfaceSelectionGroupButton(
-				buildList {
-					add(
-						SelectionItem(
-							Icons.Outlined.VpnKey,
-							title = {
-								Text(
-									stringResource(R.string.vpn_kill_switch),
-									style = MaterialTheme.typography.bodyMedium.copy(MaterialTheme.colorScheme.onSurface),
-								)
-							},
-							onClick = {
-								toggleVpnKillSwitch()
-							},
-							trailing = {
-								ScaledSwitch(
-									uiState.settings.isVpnKillSwitchEnabled,
-									onClick = {
-										toggleVpnKillSwitch()
-									},
-								)
-							},
-						),
-					)
-					if (uiState.settings.isVpnKillSwitchEnabled) {
-						add(
-							SelectionItem(
-								Icons.Outlined.Lan,
-								title = {
-									Text(
-										stringResource(R.string.allow_lan_traffic),
-										style = MaterialTheme.typography.bodyMedium.copy(MaterialTheme.colorScheme.onSurface),
-									)
-								},
-								onClick = { toggleLanOnKillSwitch() },
-								description = {
-									Text(
-										stringResource(R.string.bypass_lan_for_kill_switch),
-										style = MaterialTheme.typography.bodySmall.copy(MaterialTheme.colorScheme.outline),
-									)
-								},
-								trailing = {
-									ScaledSwitch(
-										uiState.settings.isLanOnKillSwitchEnabled,
-										onClick = {
-											toggleLanOnKillSwitch()
-										},
-									)
-								},
-							),
-						)
-					}
-				},
-			)
-		}
-	}
-}