remove provider

#768
#797

.github/workflows/build.yml

@@ -1,4 +1,7 @@
 name: build
+permissions:
+  contents: read
+
 on:
   workflow_dispatch:
     inputs:
@@ -12,6 +15,14 @@ on:
           - prerelease
           - nightly
           - release
+      flavor:
+        type: choice
+        description: "Product flavor"
+        required: true
+        default: fdroid
+        options:
+          - fdroid
+          - standalone
     secrets:
       SIGNING_KEY_ALIAS:
         required: false
@@ -30,6 +41,11 @@ on:
         description: "Build type"
         required: true
         default: debug
+      flavor:
+        type: string
+        description: "Product flavor"
+        required: false
+        default: fdroid
     secrets:
       SIGNING_KEY_ALIAS:
         required: false
@@ -41,6 +57,7 @@ on:
         required: false
       KEYSTORE:
         required: false
+
 env:
   UPLOAD_DIR_ANDROID: android_artifacts
 
@@ -48,15 +65,17 @@ jobs:
   build:
     runs-on: ubuntu-latest
     env:
-      SIGNING_KEY_ALIAS: ${{ secrets.ANDROID_SIGNING_KEY_ALIAS }}
-      SIGNING_KEY_PASSWORD: ${{ secrets.ANDROID_SIGNING_KEY_PASSWORD }}
-      SIGNING_STORE_PASSWORD: ${{ secrets.ANDROID_SIGNING_STORE_PASSWORD }}
+      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
+        with:
+          fetch-depth: 0
       - name: Set up JDK 17
         uses: actions/setup-java@v4
         with:
@@ -65,61 +84,44 @@ jobs:
           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.ANDROID_KEYSTORE }}
-
-      # create keystore path for gradle to read
+          encodedString: ${{ secrets.KEYSTORE }}
       - name: Create keystore path env var
         if: ${{ inputs.build_type != 'debug' }}
         run: |
           store_path=${{ env.KEY_STORE_LOCATION }}${{ env.KEY_STORE_FILE }}
           echo "KEY_STORE_PATH=$store_path" >> $GITHUB_ENV
 
-      - name: Create service_account.json
-        if: ${{ inputs.build_type != 'debug' }}
-        id: createServiceAccount
-        run: echo '${{ secrets.ANDROID_SERVICE_ACCOUNT_JSON }}' > service_account.json
-
-      - name: Build Fdroid Release APK
-        if: ${{ inputs.build_type == 'release' }}
-        run: ./gradlew :app:assembleFdroidRelease --info
-
-      - name: Build Fdroid Prerelease APK
-        if: ${{ inputs.build_type == 'prerelease' }}
-        run: ./gradlew :app:assembleFdroidPrerelease --info
-
-      - name: Build Fdroid Nightly APK
-        if: ${{ inputs.build_type == 'nightly' }}
-        run: ./gradlew :app:assembleFdroidNightly --info
-
-      - name: Build Debug APK
-        if: ${{ inputs.build_type == 'debug' }}
-        run: ./gradlew :app:assembleFdroidDebug --stacktrace
-
-      # bump versionCode for nightly and prerelease builds
-      - name: Commit and push versionCode changes
-        if: ${{ inputs.build_type == 'nightly' || inputs.build_type == 'prerelease' }}
+      - name: Build APK
         run: |
-          git config --global user.name 'GitHub Actions'
-          git config --global user.email 'actions@github.com'
-          git add versionCode.txt
-          git commit -m "Automated build update"
-
+          flavor=${{ inputs.flavor }}
+          build_type=${{ inputs.build_type }}
+          case $build_type in
+            "release")
+              ./gradlew :app:assemble${flavor^}Release --info
+              ;;
+            "prerelease")
+              ./gradlew :app:assemble${flavor^}Prerelease --info
+              ;;
+            "nightly")
+              ./gradlew :app:assemble${flavor^}Nightly --info
+              ;;
+            "debug")
+              ./gradlew :app:assemble${flavor^}Debug --stacktrace
+              ;;
+          esac
       - 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
+        run: echo "path=$(find . -regex '^.*/build/outputs/apk/${{ inputs.flavor }}/${{ inputs.build_type }}/.*\.apk$' -type f | head -1 | tail -c+2)" >> $GITHUB_OUTPUT
+      - name: Upload APK
         uses: actions/upload-artifact@v4
         with:
-          name: ${{ env.UPLOAD_DIR_ANDROID }}
-          path: ${{github.workspace}}/${{ steps.apk-path.outputs.path }}
+          name: android_artifacts_${{ inputs.flavor }}
+          path: app/build/outputs/apk/${{ inputs.flavor }}/${{ inputs.build_type  }}/wgtunnel-${{ inputs.flavor }}${{ inputs.flavor == 'fdroid' && '-release' || '' }}-*.apk
           retention-days: 1
+          if-no-files-found: warn

.github/workflows/nightly.yml

@@ -0,0 +1,127 @@
+name: nightly
+permissions:
+  contents: write
+  packages: write
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: "4 3 * * *"
+
+jobs:
+  check_commits:
+    name: Check for New Commits
+    runs-on: ubuntu-latest
+    outputs:
+      has_new_commits: ${{ steps.check.outputs.new_commits }}
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v4
+      - name: Check for new commits
+        id: check
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          NEW_COMMITS=$(git rev-list --count --after="$(date -Iseconds -d '23 hours ago')" ${{ github.sha }})
+          echo "new_commits=$NEW_COMMITS" >> $GITHUB_OUTPUT
+
+  build-standalone-nightly:
+    uses: ./.github/workflows/build.yml
+    secrets: inherit
+    with:
+      build_type: "nightly"
+      flavor: standalone
+
+  publish:
+    needs:
+      - check_commits
+      - build-standalone-nightly
+    if: ${{ needs.check_commits.outputs.has_new_commits > 0 && inputs.release_type != 'none' }}
+    name: publish-nightly
+    runs-on: ubuntu-latest
+    steps:
+
+      - uses: actions/checkout@v4
+
+      - name: Install system dependencies
+        run: |
+          sudo apt update && sudo apt install -y gh apksigner
+      - name: Set latest tag
+        uses: rickstaa/action-create-tag@v1
+        id: tag_creation
+        with:
+          tag: "latest"
+          message: "Automated tag for HEAD commit"
+          force_push_tag: true
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          tag_exists_error: false
+
+      - name: Generate Changelog
+        id: changelog
+        uses: requarks/changelog-action@v1
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          toTag: "nightly"
+          fromTag: "latest"
+          writeToFile: false
+
+      - name: Make download dir
+        run: mkdir ${{ github.workspace }}/temp
+
+      - name: Download artifacts
+        uses: actions/download-artifact@v4
+        with:
+          pattern: android_artifacts_*
+          path: ${{ github.workspace }}/temp
+
+      - name: Set release notes
+        run: |
+          echo "RELEASE_NOTES=Nightly build for the latest development version of the app." >> $GITHUB_ENV
+
+      - name: Delete previous nightly version
+        uses: ClementTsang/delete-tag-and-release@v0.4.0
+        with:
+          tag_name: "nightly"
+          delete_release: true
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Get checksum
+        id: checksum
+        run: |
+          file_path=$(find ${{ github.workspace }}/temp -type f -iname "*.apk" | head -n 1)
+          if [ -z "$file_path" ]; then
+            echo "No APK file found"
+            exit 1
+          fi
+          checksum=$(apksigner verify --print-certs "$file_path" | grep -Po "(?<=SHA-256 digest:) .*" | tr -d "[:blank:]")
+          echo "checksum=$checksum" >> $GITHUB_OUTPUT
+
+      - name: Create nightly release
+        id: create_release
+        uses: softprops/action-gh-release@v2
+        with:
+          body: |
+            ${{ env.RELEASE_NOTES }}
+
+            SHA-256 fingerprints for the 4096-bit signing certificate:
+            ```sh
+            ${{ steps.checksum.outputs.checksum }}
+            ```
+
+            To verify fingerprint:
+            ```sh
+            apksigner verify --print-certs [path to APK file] | grep SHA-256
+            ```
+
+            ### Changelog
+            ${{ steps.changelog.outputs.changes }}
+          tag_name: nightly
+          name: nightly
+          draft: false
+          prerelease: true
+          make_latest: false
+          files: |
+            ${{ github.workspace }}/temp/**/*.apk
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/pr.yml

@@ -1,4 +1,6 @@
 name: on-pr
+permissions:
+  contents: read
 
 on:
     workflow_dispatch:

.github/workflows/publish.yml

@@ -1,13 +1,17 @@
 name: publish
+permissions:
+  contents: write
+  packages: write
 
 on:
-  schedule:
-  - cron: "4 3 * * *"
+  push:
+    tags:
+      - '[0-9]*.[0-9]*.[0-9]*'
   workflow_dispatch:
     inputs:
       track:
         type: choice
-        description: "Google play release track"
+        description: "Google Play release track"
         options:
           - none
           - internal
@@ -22,80 +26,69 @@ on:
         options:
           - none
           - prerelease
-          - nightly
           - release
         default: release
         required: true
       tag_name:
         description: "Tag name for release"
         required: false
-        default: nightly
+        default: 1.1.1
+      flavor:
+        type: choice
+        description: "Product flavor"
+        required: true
+        default: standalone
+        options:
+          - fdroid
+          - standalone
   workflow_call:
-env:
-  UPLOAD_DIR_ANDROID: android_artifacts
-
-permissions:
-  contents: write
+    inputs:
+      flavor:
+        type: string
+        description: "Product flavor"
+        required: false
+        default: standalone
 
 jobs:
-  check_commits:
-    name: Check for New Commits
-    runs-on: ubuntu-latest
-    outputs:
-      has_new_commits: ${{ steps.check.outputs.new_commits }}
 
-    steps:
-      - name: Checkout Repository
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0  # This fetches all history so we can check commits
-
-      - name: Check for new commits
-        id: check
-        env:
-          GITHUB_TOKEN: ${{ secrets.PAT }}
-        run: |
-          # 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' }}
+  build-fdroid:
+    if: ${{ github.event_name == 'push' || inputs.release_type == 'release' || inputs.flavor == 'fdroid' }}
     uses: ./.github/workflows/build.yml
     secrets: inherit
     with:
-      build_type: ${{ inputs.release_type == '' && 'nightly' || inputs.release_type }}
+      build_type: ${{ github.event_name == 'push' && 'release' || inputs.release_type }}
+      flavor: fdroid
+
+  build-standalone:
+    if: ${{ github.event_name == 'push' || inputs.release_type == 'release' || inputs.release_type == 'prerelease' || inputs.flavor == 'standalone' }}
+    uses: ./.github/workflows/build.yml
+    secrets: inherit
+    with:
+      build_type: ${{ github.event_name == 'push' && 'release' || inputs.release_type }}
+      flavor: standalone
 
   publish:
     needs:
-      - check_commits
-      - build
-    if: ${{ needs.check_commits.outputs.has_new_commits > 0 && inputs.release_type != 'none' }}
+      - build-standalone
     name: publish-github
     runs-on: ubuntu-latest
-    env:
-      GH_USER: ${{ secrets.PAT_USERNAME }}
-      # GH needed for gh cli
-      GH_TOKEN: ${{ secrets.PAT }}
-      GH_REPO: ${{ github.repository }}
-
     steps:
       - uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event_name == 'push' && github.ref || 'main' }}
       - 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
         with:
-          tag: "latest"  # or any tag name you wish to use
+          tag: "latest"
           message: "Automated tag for HEAD commit"
           force_push_tag: true
           github_token: ${{ secrets.GITHUB_TOKEN }}
           tag_exists_error: false
-
       - name: Get latest release
         id: latest_release
         uses: kaliber5/action-get-release@v1
@@ -108,22 +101,9 @@ jobs:
         uses: requarks/changelog-action@v1
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
-          toTag: ${{ github.event_name == 'schedule' && 'nightly' || steps.latest_release.outputs.tag_name }}
+          toTag: ${{ steps.latest_release.outputs.tag_name }}
           fromTag: "latest"
-          writeToFile: false  # we won't write to file, just output
-
-      - name: Get version code
-        if: ${{ inputs.release_type == 'release' }}
-        run: |
-          version_code=$(grep "VERSION_CODE" buildSrc/src/main/kotlin/Constants.kt | awk '{print $5}' | tr -d '\n')
-          echo "VERSION_CODE=$version_code" >> $GITHUB_ENV
-
-      - name: Push changes
-        if: ${{ inputs.release_type == '' || inputs.release_type == 'nightly'  || inputs.release_type == 'prerelease' }}
-        uses: ad-m/github-push-action@master
-        with:
-          github_token: ${{ secrets.PAT }}
-          branch: ${{ github.ref }}
+          writeToFile: false
 
       - name: Make download dir
         run: mkdir ${{ github.workspace }}/temp
@@ -131,53 +111,43 @@ jobs:
       - name: Download artifacts
         uses: actions/download-artifact@v4
         with:
-          name: ${{ env.UPLOAD_DIR_ANDROID }}
+          pattern: android_artifacts_*
           path: ${{ github.workspace }}/temp
-
-      # Setup TAG_NAME, which is used as a general "name"
-      - if: github.event_name == 'workflow_dispatch'
-        run: echo "TAG_NAME=${{ github.event.inputs.tag_name }}" >> $GITHUB_ENV
-      - if: github.event_name == 'schedule'
-        run: echo "TAG_NAME=nightly" >> $GITHUB_ENV
+          merge-multiple: true
 
       - name: Set version release notes
-        if: ${{ inputs.release_type == 'release' }}
+        if: ${{ github.event_name == 'push' || inputs.release_type == 'release' }}
         run: |
-          RELEASE_NOTES="$(cat ${{ github.workspace }}/fastlane/metadata/android/en-US/changelogs/${{ env.VERSION_CODE }}.txt)"
+          VERSION_NAME=$(grep "const val VERSION_NAME" buildSrc/src/main/kotlin/Constants.kt | awk -F'"' '{print $2}')
+          RELEASE_NOTES="$(cat ${{ github.workspace }}/fastlane/metadata/android/en-US/changelogs/${VERSION_NAME}.txt || echo "No changelog found for ${VERSION_NAME}")"
           echo "RELEASE_NOTES<<EOF" >> $GITHUB_ENV
           echo "$RELEASE_NOTES" >> $GITHUB_ENV
           echo "EOF" >> $GITHUB_ENV
 
-      - name: On nightly release notes
-        if: ${{ contains(env.TAG_NAME, 'nightly') }}
-        run: |
-          echo "RELEASE_NOTES=Nightly build for the latest development version of the app." >> $GITHUB_ENV
-          gh release delete nightly --yes || true
-          git push origin :nightly || true
-
       - name: On prerelease release notes
-        if: ${{ inputs.release_type == 'prerelease' }}
+        if: ${{ github.event_name != 'push' && inputs.release_type == 'prerelease' }}
         run: |
           echo "RELEASE_NOTES=Testing version of app for specific feature." >> $GITHUB_ENV
-          gh release delete ${{ github.event.inputs.tag_name }} --yes || true
 
       - 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
+          file_path=$(find ${{ github.workspace }}/temp -type f -iname "*.apk" | head -n 1)
+          if [ -z "$file_path" ]; then
+            echo "No APK file found"
+            exit 1
+          fi
+          checksum=$(apksigner verify --print-certs "$file_path" | grep -Po "(?<=SHA-256 digest:) .*" | tr -d "[:blank:]")
+          echo "checksum=$checksum" >> $GITHUB_OUTPUT
 
-
-      - name: Create Release with Fastlane changelog notes
+      - name: Create Release
         id: create_release
         uses: softprops/action-gh-release@v2
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           body: |
             ${{ env.RELEASE_NOTES }}
 
-            SHA-256 fingerprint for the 4096-bit signing certificate:
+            SHA-256 fingerprints for the 4096-bit signing certificate:
             ```sh
             ${{ steps.checksum.outputs.checksum }}
             ```
@@ -189,40 +159,40 @@ jobs:
 
             ### Changelog
             ${{ steps.changelog.outputs.changes }}
-          tag_name: ${{ env.TAG_NAME }}
-          name: ${{ env.TAG_NAME }}
+          tag_name: ${{ github.event_name == 'push' && github.ref_name || github.event.inputs.tag_name }}
+          name: ${{ github.event_name == 'push' && github.ref_name || github.event.inputs.tag_name }}
           draft: false
-          prerelease: ${{ inputs.release_type == 'prerelease' || inputs.release_type == '' || inputs.release_type == 'nightly' }}
-          make_latest: ${{ inputs.release_type == 'release' }}
+          prerelease: ${{ github.event_name != 'push' && inputs.release_type == 'prerelease' }}
+          make_latest: ${{ github.event_name == 'push' || inputs.release_type == 'release' }}
           files: |
-            ${{ github.workspace }}/temp/*
+            ${{ github.workspace }}/temp/**/*.apk
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-  publish-fdroid:
+  publish-fdroid-public:
     runs-on: ubuntu-latest
     needs:
-      - build
-    if: inputs.release_type == 'release'
+      - build-fdroid
+    if: ${{ github.event_name == 'push' || inputs.release_type == 'release' }}
     steps:
       - name: Dispatch update for fdroid repo
         uses: peter-evans/repository-dispatch@v3
         with:
-          token: ${{ secrets.PAT }}
-          repository: zaneschepke/fdroid
+          token: ${{ secrets.GITHUB_TOKEN }}
+          repository: wgtunnel/fdroid
           event-type: fdroid-update
 
   publish-play:
-    if: ${{ inputs.track != 'none' && inputs.track != '' }}
+    if: ${{ github.event_name == 'push' || inputs.track != 'none' }}
     name: Publish to Google Play
     runs-on: ubuntu-latest
 
     env:
-      SIGNING_KEY_ALIAS: ${{ secrets.ANDROID_SIGNING_KEY_ALIAS }}
-      SIGNING_KEY_PASSWORD: ${{ secrets.ANDROID_SIGNING_KEY_PASSWORD }}
-      SIGNING_STORE_PASSWORD: ${{ secrets.ANDROID_SIGNING_STORE_PASSWORD }}
+      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.PAT_USERNAME }}
-      GH_TOKEN: ${{ secrets.PAT }}
 
     steps:
       - uses: actions/checkout@v4
@@ -244,7 +214,7 @@ jobs:
         with:
           fileName: ${{ env.KEY_STORE_FILE }}
           fileDir: ${{ env.KEY_STORE_LOCATION }}
-          encodedString: ${{ secrets.ANDROID_KEYSTORE }}
+          encodedString: ${{ secrets.KEYSTORE }}
 
       # create keystore path for gradle to read
       - name: Create keystore path env var
@@ -263,5 +233,6 @@ jobs:
           bundler-cache: true
 
       - name: Distribute app to Prod track 🚀
-        run: (cd ${{ github.workspace }} && bundle install && bundle exec fastlane ${{ inputs.track }})
-
+        run: |
+          track=${{ github.event_name == 'push' && 'production' || inputs.track }}
+          (cd ${{ github.workspace }} && bundle install && bundle exec fastlane $track)

.gitignore

@@ -70,5 +70,5 @@ lint/tmp/
 app/release/output.json
 .idea/codeStyles/
 # where we keep our signing secrets locally
-app/signing.properties
 /.kotlin/
+/app/keystore/

app/build.gradle.kts

@@ -9,33 +9,14 @@ plugins {
     alias(libs.plugins.licensee)
 }
 
-val versionFile = file("$rootDir/versionCode.txt")
-
-val versionCodeIncrement =
-    with(getBuildTaskName().lowercase()) {
-        when {
-            this.contains(Constants.NIGHTLY) || this.contains(Constants.PRERELEASE) -> {
-                if (versionFile.exists()) {
-                    versionFile.readText().trim().toInt() + 1
-                } else {
-                    1
-                }
-            }
-            else -> 0
-        }
-    }
-
 android {
     namespace = Constants.APP_ID
     compileSdk = Constants.TARGET_SDK
 
     androidResources { generateLocaleConfig = true }
 
-    // reproducibility
     dependenciesInfo {
-        // Disables dependency metadata when building APKs.
         includeInApk = false
-        // Disables dependency metadata when building Android App Bundles.
         includeInBundle = false
     }
 
@@ -43,14 +24,12 @@ android {
         applicationId = Constants.APP_ID
         minSdk = Constants.MIN_SDK
         targetSdk = Constants.TARGET_SDK
-        versionCode = Constants.VERSION_CODE + versionCodeIncrement
-        versionName = determineVersionName()
+        versionCode = computeVersionCode()
+        versionName = computeVersionName()
 
         ksp { arg("room.schemaLocation", "$projectDir/schemas") }
 
-        sourceSets {
-            getByName("debug").assets.srcDirs(files("$projectDir/schemas")) // Room
-        }
+        sourceSets { getByName("debug").assets.srcDirs(files("$projectDir/schemas")) }
 
         buildConfigField(
             "String[]",
@@ -64,15 +43,18 @@ android {
 
     signingConfigs {
         create(Constants.RELEASE) {
-            storeFile = getStoreFile()
-            storePassword = getSigningProperty(Constants.STORE_PASS_VAR)
-            keyAlias = getSigningProperty(Constants.KEY_ALIAS_VAR)
-            keyPassword = getSigningProperty(Constants.KEY_PASS_VAR)
+            storeFile = file(System.getenv("KEY_STORE_PATH") ?: "keystore/android_keystore.jks")
+            storePassword =
+                LocalProperties.get("SIGNING_STORE_PASSWORD")
+                    ?: System.getenv("SIGNING_STORE_PASSWORD")
+            keyAlias =
+                LocalProperties.get("SIGNING_KEY_ALIAS") ?: System.getenv("SIGNING_KEY_ALIAS")
+            keyPassword =
+                LocalProperties.get("SIGNING_KEY_PASSWORD") ?: System.getenv("SIGNING_KEY_PASSWORD")
         }
     }
 
     buildTypes {
-        // don't strip
         packaging.jniLibs.keepDebugSymbols.addAll(
             listOf("libwg-go.so", "libwg-quick.so", "libwg.so")
         )
@@ -88,6 +70,7 @@ android {
             signingConfig = signingConfigs.getByName(Constants.RELEASE)
             resValue("string", "provider", "\"${Constants.APP_NAME}.provider\"")
         }
+
         debug {
             applicationIdSuffix = ".debug"
             resValue("string", "app_name", "WG Tunnel - Debug")
@@ -108,31 +91,28 @@ android {
             resValue("string", "app_name", "WG Tunnel - Nightly")
             resValue("string", "provider", "\"${Constants.APP_NAME}.provider.nightly\"")
         }
-
-        applicationVariants.all {
-            val variant = this
-            variant.outputs
-                .map { it as com.android.build.gradle.internal.api.BaseVariantOutputImpl }
-                .forEach { output ->
-                    val outputFileName =
-                        "${Constants.APP_NAME}-${variant.flavorName}-" +
-                            "${variant.buildType.name}-${variant.versionName}.apk"
-                    output.outputFileName = outputFileName
-                }
-        }
     }
-    flavorDimensions.add(Constants.TYPE)
+
+    flavorDimensions.add("type")
     productFlavors {
         create("fdroid") {
-            dimension = Constants.TYPE
-            proguardFile("fdroid-rules.pro")
+            dimension = "type"
+            buildConfigField("String", "FLAVOR", "\"fdroid\"")
+        }
+        create("google") {
+            dimension = "type"
+            buildConfigField("String", "FLAVOR", "\"google\"")
+        }
+        create("standalone") {
+            dimension = "type"
+            buildConfigField("String", "FLAVOR", "\"standalone\"")
         }
-        create("general") { dimension = Constants.TYPE }
     }
+
     compileOptions {
+        isCoreLibraryDesugaringEnabled = true
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
-        isCoreLibraryDesugaringEnabled = true
     }
     kotlinOptions { jvmTarget = Constants.JVM_TARGET }
     buildFeatures {
@@ -143,10 +123,22 @@ android {
 
     licensee {
         Constants.allowedLicenses.forEach { allow(it) }
-        allowUrl(Constants.XZING_LICENSE_URL)
+        Constants.allowedLicenseUrls.forEach { allowUrl(it) }
+    }
 
-        // Fix for qrcode-kotlin (MIT, custom URL)
-        allowUrl("https://rafaellins.mit-license.org/2021/")
+    applicationVariants.all {
+        val variant = this
+        variant.outputs
+            .map { it as com.android.build.gradle.internal.api.BaseVariantOutputImpl }
+            .forEach { output ->
+                val outputFileName =
+                    if (variant.flavorName == "fdroid" && variant.buildType.name == "release") {
+                        "${Constants.APP_NAME}-fdroid-release-${variant.versionName}.apk"
+                    } else {
+                        "${Constants.APP_NAME}-${variant.flavorName}-v${variant.versionName}.apk"
+                    }
+                output.outputFileName = outputFileName
+            }
     }
 }
 
@@ -156,8 +148,6 @@ dependencies {
 
     implementation(libs.androidx.core.ktx)
     implementation(libs.androidx.lifecycle.runtime.ktx)
-
-    // helpers for implementing LifecycleOwner in a Service
     implementation(libs.androidx.lifecycle.service)
     implementation(libs.androidx.activity.compose)
     implementation(platform(libs.androidx.compose.bom))
@@ -169,7 +159,6 @@ dependencies {
     implementation(libs.material)
     implementation(libs.androidx.storage)
 
-    // test
     testImplementation(libs.junit)
     testImplementation(libs.androidx.junit)
     androidTestImplementation(libs.androidx.junit)
@@ -180,108 +169,76 @@ dependencies {
     debugImplementation(libs.androidx.compose.ui.tooling)
     debugImplementation(libs.androidx.compose.manifest)
 
-    // tunnel
     implementation(libs.tunnel)
     implementation(libs.amneziawg.android)
     coreLibraryDesugaring(libs.desugar.jdk.libs)
 
-    // logging
     implementation(libs.timber)
 
-    // compose navigation
     implementation(libs.androidx.navigation.compose)
     implementation(libs.androidx.hilt.navigation.compose)
 
-    // hilt
     implementation(libs.hilt.android)
     ksp(libs.hilt.android.compiler)
     ksp(libs.androidx.hilt.compiler)
 
-    // accompanist
     implementation(libs.accompanist.permissions)
     implementation(libs.accompanist.drawablepainter)
 
-    // storage
     implementation(libs.androidx.room.runtime)
     ksp(libs.androidx.room.compiler)
     implementation(libs.androidx.room.ktx)
     implementation(libs.androidx.datastore.preferences)
 
-    // lifecycle
     implementation(libs.lifecycle.runtime.compose)
     implementation(libs.androidx.lifecycle.runtime.ktx)
     implementation(libs.androidx.lifecycle.process)
 
-    // serialization
     implementation(libs.kotlinx.serialization.json)
 
-    // ui
     implementation(libs.zxing.android.embedded)
+
     implementation(libs.material.icons.extended)
 
-    // bio
     implementation(libs.androidx.biometric.ktx)
     implementation(libs.pin.lock.compose)
 
-    // shortcuts
     implementation(libs.androidx.core)
 
-    // splash
     implementation(libs.androidx.core.splashscreen)
 
-    // worker
     implementation(libs.androidx.work.runtime)
     implementation(libs.androidx.hilt.work)
 
-    // util
-    implementation(libs.qrcode.kotlin)
+    implementation(libs.qrose)
     implementation(libs.semver4j)
 
-    // Ktor
     implementation(libs.ktor.client.core)
     implementation(libs.ktor.client.okhttp)
     implementation(libs.ktor.client.cio)
     implementation(libs.ktor.client.content.negotiation)
     implementation(libs.ktor.serialization.kotlinx.json)
-}
+    implementation(libs.slf4j.android)
 
-fun determineVersionName(): String {
-    return with(getBuildTaskName().lowercase()) {
-        when {
-            contains(Constants.NIGHTLY) || contains(Constants.PRERELEASE) ->
-                Constants.VERSION_NAME + "-${grgitService.service.get().grgit.head().abbreviatedId}"
-            else -> Constants.VERSION_NAME
-        }
-    }
-}
-
-val incrementVersionCode by
-    tasks.registering {
-        doLast {
-            val versionFile = file("$rootDir/versionCode.txt")
-            if (versionFile.exists()) {
-                versionFile.writeText(versionCodeIncrement.toString())
-                println("Incremented versionCode to $versionCodeIncrement")
-            }
-        }
-    }
-
-tasks.whenTaskAdded {
-    if (name.startsWith("assemble") && !name.lowercase().contains("debug")) {
-        dependsOn(incrementVersionCode)
-    }
+    // shizuku
+    implementation(libs.shizuku.api)
+    implementation(libs.shizuku.provider)
 }
 
 tasks.register<Copy>("copyLicenseeJsonToAssets") {
     dependsOn("licensee")
-
     val outputAssets = layout.projectDirectory.dir("src/main/assets")
-
     from(layout.buildDirectory.file("reports/licensee/androidFdroidRelease/artifacts.json")) {
         rename("artifacts.json", "licenses.json")
     }
-
     into(outputAssets)
 }
 
 tasks.named("preBuild") { dependsOn("copyLicenseeJsonToAssets") }
+
+// https://gist.github.com/obfusk/61046e09cee352ae6dd109911534b12e#fix-proposed-by-linsui-disable-baseline-profiles
+tasks.whenTaskAdded {
+    if (name.contains("ArtProfile")) {
+        enabled = false
+    }
+}

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

@@ -155,9 +155,7 @@
           "columnNames": [
             "id"
           ]
-        },
-        "indices": [],
-        "foreignKeys": []
+        }
       },
       {
         "tableName": "TunnelConfig",
@@ -227,21 +225,18 @@
             "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"
           },
           {
@@ -275,11 +270,9 @@
             "orders": [],
             "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_TunnelConfig_name` ON `${TABLE_NAME}` (`name`)"
           }
-        ],
-        "foreignKeys": []
+        ]
       }
     ],
-    "views": [],
     "setupQueries": [
       "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
       "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'ae51793c4d09ea3194ecd26f0606f35c')"

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

@@ -0,0 +1,295 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 17,
+    "identityHash": "380d82359c99933cc9ce783347c4ec31",
+    "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_stop_on_no_internet_enabled` INTEGER NOT NULL DEFAULT false, `is_vpn_kill_switch_enabled` INTEGER NOT NULL DEFAULT false, `is_kernel_kill_switch_enabled` INTEGER NOT NULL DEFAULT false, `is_lan_on_kill_switch_enabled` INTEGER NOT NULL DEFAULT false, `debounce_delay_seconds` INTEGER NOT NULL DEFAULT 3, `is_disable_kill_switch_on_trusted_enabled` INTEGER NOT NULL DEFAULT false, `is_tunnel_on_unsecure_enabled` INTEGER NOT NULL DEFAULT false, `split_tunnel_apps` TEXT NOT NULL DEFAULT '', `wifi_detection_method` INTEGER NOT NULL DEFAULT 0)",
+        "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": "isStopOnNoInternetEnabled",
+            "columnName": "is_stop_on_no_internet_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "false"
+          },
+          {
+            "fieldPath": "isVpnKillSwitchEnabled",
+            "columnName": "is_vpn_kill_switch_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "false"
+          },
+          {
+            "fieldPath": "isKernelKillSwitchEnabled",
+            "columnName": "is_kernel_kill_switch_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "false"
+          },
+          {
+            "fieldPath": "isLanOnKillSwitchEnabled",
+            "columnName": "is_lan_on_kill_switch_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "false"
+          },
+          {
+            "fieldPath": "debounceDelaySeconds",
+            "columnName": "debounce_delay_seconds",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "3"
+          },
+          {
+            "fieldPath": "isDisableKillSwitchOnTrustedEnabled",
+            "columnName": "is_disable_kill_switch_on_trusted_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "false"
+          },
+          {
+            "fieldPath": "isTunnelOnUnsecureEnabled",
+            "columnName": "is_tunnel_on_unsecure_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "false"
+          },
+          {
+            "fieldPath": "splitTunnelApps",
+            "columnName": "split_tunnel_apps",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "''"
+          },
+          {
+            "fieldPath": "wifiDetectionMethod",
+            "columnName": "wifi_detection_method",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        }
+      },
+      {
+        "tableName": "TunnelConfig",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `name` TEXT NOT NULL, `wg_quick` TEXT NOT NULL, `tunnel_networks` TEXT NOT NULL DEFAULT '', `is_mobile_data_tunnel` INTEGER NOT NULL DEFAULT false, `is_primary_tunnel` INTEGER NOT NULL DEFAULT false, `am_quick` TEXT NOT NULL DEFAULT '', `is_Active` INTEGER NOT NULL DEFAULT false, `is_ping_enabled` INTEGER NOT NULL DEFAULT false, `ping_interval` INTEGER DEFAULT null, `ping_cooldown` INTEGER DEFAULT null, `ping_ip` TEXT DEFAULT null, `is_ethernet_tunnel` INTEGER NOT NULL DEFAULT false, `is_ipv4_preferred` INTEGER NOT NULL DEFAULT true)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "wgQuick",
+            "columnName": "wg_quick",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "tunnelNetworks",
+            "columnName": "tunnel_networks",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "''"
+          },
+          {
+            "fieldPath": "isMobileDataTunnel",
+            "columnName": "is_mobile_data_tunnel",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "false"
+          },
+          {
+            "fieldPath": "isPrimaryTunnel",
+            "columnName": "is_primary_tunnel",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "false"
+          },
+          {
+            "fieldPath": "amQuick",
+            "columnName": "am_quick",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "''"
+          },
+          {
+            "fieldPath": "isActive",
+            "columnName": "is_Active",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "false"
+          },
+          {
+            "fieldPath": "isPingEnabled",
+            "columnName": "is_ping_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "false"
+          },
+          {
+            "fieldPath": "pingInterval",
+            "columnName": "ping_interval",
+            "affinity": "INTEGER",
+            "defaultValue": "null"
+          },
+          {
+            "fieldPath": "pingCooldown",
+            "columnName": "ping_cooldown",
+            "affinity": "INTEGER",
+            "defaultValue": "null"
+          },
+          {
+            "fieldPath": "pingIp",
+            "columnName": "ping_ip",
+            "affinity": "TEXT",
+            "defaultValue": "null"
+          },
+          {
+            "fieldPath": "isEthernetTunnel",
+            "columnName": "is_ethernet_tunnel",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "false"
+          },
+          {
+            "fieldPath": "isIpv4Preferred",
+            "columnName": "is_ipv4_preferred",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "true"
+          }
+        ],
+        "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`)"
+          }
+        ]
+      }
+    ],
+    "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, '380d82359c99933cc9ce783347c4ec31')"
+    ]
+  }
+}

app/src/full/AndroidManifest.xml

@@ -0,0 +1,5 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- Permissions specific to full -->
+    <!--updater-->
+    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
+</manifest>

app/src/main/AndroidManifest.xml

@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
-	<!--updater-->
-	<uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
 
 	<uses-permission android:name="android.permission.INTERNET" />
 	<uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
@@ -54,7 +52,7 @@
     <application
         android:name=".WireGuardAutoTunnel"
         android:allowBackup="false"
-        android:banner="@drawable/ic_banner"
+        android:banner="@mipmap/ic_banner"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:enableOnBackInvokedCallback="true"
         android:fullBackupContent="@xml/backup_rules"
@@ -64,10 +62,13 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.App.Start"
         tools:targetApi="tiramisu">
+		<activity
+			android:name="com.journeyapps.barcodescanner.CaptureActivity"
+			android:screenOrientation="portrait"
+			tools:replace="screenOrientation" />
         <activity
             android:name=".MainActivity"
             android:exported="true"
-			android:banner="@mipmap/ic_banner"
 			android:windowSoftInputMode="adjustNothing"
             android:theme="@style/Theme.WireguardAutoTunnel"
 			android:configChanges="orientation|screenSize|keyboardHidden"
@@ -81,10 +82,6 @@
                 <action android:name="android.service.quicksettings.action.QS_TILE_PREFERENCES" />
             </intent-filter>
         </activity>
-        <activity
-            android:name="com.journeyapps.barcodescanner.CaptureActivity"
-            android:screenOrientation="portrait"
-            tools:replace="screenOrientation" />
 
         <activity
             android:name=".core.shortcut.ShortcutsActivity"
@@ -169,15 +166,11 @@
         <receiver
             android:name=".core.broadcast.RestartReceiver"
             android:enabled="true"
-            android:exported="false"
-			android:directBootAware="true">
+            android:exported="false">
             <intent-filter>
-				<action android:name="android.intent.action.SCREEN_ON" />
-				<action android:name="android.intent.action.USER_PRESENT" />
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
                 <action android:name="android.intent.action.QUICKBOOT_POWERON" />
                 <action android:name="com.htc.intent.action.QUICKBOOT_POWERON" />
-				<action android:name="android.intent.action.LOCKED_BOOT_COMPLETED" />
 				<action android:name="android.intent.action.MY_PACKAGE_REPLACED" />
             </intent-filter>
         </receiver>

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

@@ -22,7 +22,6 @@ import androidx.compose.animation.slideOutVertically
 import androidx.compose.foundation.background
 import androidx.compose.foundation.gestures.detectTapGestures
 import androidx.compose.foundation.layout.*
-import androidx.compose.material.icons.rounded.Settings
 import androidx.compose.material3.*
 import androidx.compose.runtime.*
 import androidx.compose.ui.Modifier
@@ -39,7 +38,6 @@ import androidx.navigation.compose.rememberNavController
 import androidx.navigation.toRoute
 import com.zaneschepke.networkmonitor.NetworkMonitor
 import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelManager
-import com.zaneschepke.wireguardautotunnel.domain.enums.TunnelStatus
 import com.zaneschepke.wireguardautotunnel.domain.repository.AppStateRepository
 import com.zaneschepke.wireguardautotunnel.ui.Route
 import com.zaneschepke.wireguardautotunnel.ui.common.dialog.VpnDeniedDialog
@@ -51,11 +49,11 @@ import com.zaneschepke.wireguardautotunnel.ui.navigation.components.DynamicTopAp
 import com.zaneschepke.wireguardautotunnel.ui.navigation.components.currentNavBackStackEntryAsNavBarState
 import com.zaneschepke.wireguardautotunnel.ui.screens.autotunnel.AutoTunnelScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.autotunnel.advanced.AutoTunnelAdvancedScreen
+import com.zaneschepke.wireguardautotunnel.ui.screens.autotunnel.detection.WifiDetectionMethodScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.autotunnel.disclosure.LocationDisclosureScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.main.MainScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.main.autotunnel.TunnelAutoTunnelScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.main.config.ConfigScreen
-import com.zaneschepke.wireguardautotunnel.ui.screens.main.scanner.ScannerScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.main.splittunnel.SplitTunnelScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.main.tunneloptions.TunnelOptionsScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.pin.PinLockScreen
@@ -89,6 +87,8 @@ class MainActivity : AppCompatActivity() {
 
     private var lastLocationPermissionState: Boolean? = null
 
+    val REQUEST_CODE = 123
+
     @SuppressLint("BatteryLife")
     override fun onCreate(savedInstanceState: Bundle?) {
         enableEdgeToEdge(
@@ -110,6 +110,7 @@ class MainActivity : AppCompatActivity() {
             val isTv = isRunningOnTv()
             val appUiState by viewModel.uiState.collectAsStateWithLifecycle()
             val appViewState by viewModel.appViewState.collectAsStateWithLifecycle()
+            val tunnelError by viewModel.tunnelManager.errorEvents.collectAsStateWithLifecycle(null)
 
             val navController = rememberNavController()
             val backStackEntry by navController.currentBackStackEntryAsState()
@@ -134,6 +135,7 @@ class MainActivity : AppCompatActivity() {
                             vpnPermissionDenied = true
                         } else {
                             vpnPermissionDenied = false
+                            showVpnPermissionDialog = false
                         }
                     },
                 )
@@ -151,6 +153,15 @@ class MainActivity : AppCompatActivity() {
                     viewModel.handleEvent(AppEvent.SetBatteryOptimizeDisableShown)
                 }
 
+            LaunchedEffect(tunnelError) {
+                if (tunnelError == null) return@LaunchedEffect
+                val message = tunnelError!!.second.toStringRes()
+                val context = this@MainActivity
+                snackbar.showSnackbar(
+                    context.getString(R.string.tunnel_error_template, context.getString(message))
+                )
+            }
+
             with(appViewState) {
                 LaunchedEffect(isConfigChanged) {
                     if (isConfigChanged) {
@@ -166,21 +177,6 @@ class MainActivity : AppCompatActivity() {
                         viewModel.handleEvent(AppEvent.MessageShown)
                     }
                 }
-                LaunchedEffect(appUiState.activeTunnels) {
-                    appUiState.activeTunnels.mapNotNull { (tunnelConf, tunnelState) ->
-                        (tunnelState.status as? TunnelStatus.Error)?.let { error ->
-                            val message = error.error.toStringRes()
-                            val context = this@MainActivity
-                            snackbar.showSnackbar(
-                                context.getString(
-                                    R.string.tunnel_error_template,
-                                    context.getString(message),
-                                )
-                            )
-                            viewModel.handleEvent(AppEvent.ClearTunnelError(tunnelConf))
-                        }
-                    }
-                }
                 LaunchedEffect(popBackStack) {
                     if (popBackStack) {
                         navController.popBackStack()
@@ -214,7 +210,10 @@ class MainActivity : AppCompatActivity() {
                     WireguardAutoTunnelTheme(theme = appUiState.appState.theme) {
                         VpnDeniedDialog(
                             showVpnPermissionDialog,
-                            onDismiss = { showVpnPermissionDialog = false },
+                            onDismiss = {
+                                showVpnPermissionDialog = false
+                                vpnPermissionDenied = false
+                            },
                         )
 
                         Scaffold(
@@ -288,6 +287,9 @@ class MainActivity : AppCompatActivity() {
                                     composable<Route.AutoTunnelAdvanced> {
                                         AutoTunnelAdvancedScreen(appUiState, viewModel)
                                     }
+                                    composable<Route.WifiDetectionMethod> {
+                                        WifiDetectionMethodScreen(appUiState, viewModel)
+                                    }
                                     composable<Route.Logs> { LogsScreen(appViewState, viewModel) }
                                     composable<Route.Config> { backStack ->
                                         val args = backStack.toRoute<Route.Config>()
@@ -300,11 +302,10 @@ class MainActivity : AppCompatActivity() {
                                         appUiState.tunnels
                                             .firstOrNull { it.id == args.id }
                                             ?.let { config ->
-                                                TunnelOptionsScreen(config, viewModel)
+                                                TunnelOptionsScreen(config, viewModel, appViewState)
                                             }
                                     }
                                     composable<Route.Lock> { PinLockScreen(viewModel) }
-                                    composable<Route.Scanner> { ScannerScreen(viewModel) }
                                     composable<Route.KillSwitch> {
                                         KillSwitchScreen(appUiState, viewModel)
                                     }

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

@@ -3,12 +3,12 @@ package com.zaneschepke.wireguardautotunnel.core.broadcast
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
+import com.zaneschepke.logcatter.LogReader
 import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
 import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelManager
 import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
 import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
 import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
-import com.zaneschepke.wireguardautotunnel.util.extensions.isRunningOnTv
 import dagger.hilt.android.AndroidEntryPoint
 import javax.inject.Inject
 import kotlinx.coroutines.CoroutineDispatcher
@@ -26,20 +26,20 @@ class RestartReceiver : BroadcastReceiver() {
 
     @Inject lateinit var tunnelManager: TunnelManager
 
+    @Inject lateinit var logReader: LogReader
+
     @Inject @IoDispatcher lateinit var ioDispatcher: CoroutineDispatcher
 
     override fun onReceive(context: Context, intent: Intent) {
         Timber.d("RestartReceiver triggered with action: ${intent.action}")
-        // screen on for Android TV only to help with sleep shutdowns
-        val isTv = context.isRunningOnTv()
-        if (intent.action == Intent.ACTION_SCREEN_ON && !isTv) return
-        if (intent.action == Intent.ACTION_USER_PRESENT && !isTv) return
         serviceManager.updateTunnelTile()
         serviceManager.updateAutoTunnelTile()
         applicationScope.launch(ioDispatcher) {
             val settings = appDataRepository.settings.get()
             if (settings.isRestoreOnBootEnabled) {
-                if (settings.isAutoTunnelEnabled && !serviceManager.autoTunnelActive.value) {
+                if (
+                    settings.isAutoTunnelEnabled && serviceManager.autoTunnelService.value == null
+                ) {
                     Timber.d("Starting auto-tunnel on boot/update")
                     serviceManager.startAutoTunnel()
                 } else {
@@ -49,6 +49,7 @@ class RestartReceiver : BroadcastReceiver() {
             } else {
                 Timber.d("Restore on boot disabled, skipping")
             }
+            if (intent.action == Intent.ACTION_MY_PACKAGE_REPLACED) logReader.deleteAndClearLogs()
         }
     }
 }

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

@@ -1,10 +1,11 @@
 package com.zaneschepke.wireguardautotunnel.core.service
 
-import android.app.Service
+import android.content.ComponentName
 import android.content.Context
 import android.content.Intent
+import android.content.ServiceConnection
 import android.net.VpnService
-import com.zaneschepke.wireguardautotunnel.WireGuardAutoTunnel
+import android.os.IBinder
 import com.zaneschepke.wireguardautotunnel.core.service.autotunnel.AutoTunnelService
 import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
 import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
@@ -13,7 +14,6 @@ import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
 import com.zaneschepke.wireguardautotunnel.util.extensions.requestAutoTunnelTileServiceUpdate
 import com.zaneschepke.wireguardautotunnel.util.extensions.requestTunnelTileServiceStateUpdate
 import jakarta.inject.Inject
-import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -37,23 +37,37 @@ constructor(
 
     private val autoTunnelMutex = Mutex()
 
-    private val _autoTunnelActive = MutableStateFlow(false)
-    val autoTunnelActive = _autoTunnelActive.asStateFlow()
+    private val _tunnelService = MutableStateFlow<TunnelForegroundService?>(null)
+    private val _autoTunnelService = MutableStateFlow<AutoTunnelService?>(null)
+    val autoTunnelService = _autoTunnelService.asStateFlow()
 
-    var autoTunnelService = CompletableDeferred<AutoTunnelService>()
-    var backgroundService = CompletableDeferred<TunnelForegroundService>()
-
-    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)
-                }
+    private val tunnelServiceConnection =
+        object : ServiceConnection {
+            override fun onServiceConnected(name: ComponentName, service: IBinder) {
+                val binder = service as? TunnelForegroundService.LocalBinder
+                _tunnelService.value = binder?.service
+                Timber.d("TunnelForegroundService connected")
             }
-            .onFailure { Timber.e(it) }
-    }
+
+            override fun onServiceDisconnected(name: ComponentName) {
+                _tunnelService.value = null
+                Timber.d("TunnelForegroundService disconnected")
+            }
+        }
+
+    private val autoTunnelServiceConnection =
+        object : ServiceConnection {
+            override fun onServiceConnected(name: ComponentName, service: IBinder) {
+                val binder = service as? AutoTunnelService.LocalBinder
+                _autoTunnelService.value = binder?.service
+                Timber.d("AutoTunnelService connected")
+            }
+
+            override fun onServiceDisconnected(name: ComponentName) {
+                _autoTunnelService.value = null
+                Timber.d("AutoTunnelService disconnected")
+            }
+        }
 
     fun hasVpnPermission(): Boolean {
         return VpnService.prepare(context) == null
@@ -63,20 +77,13 @@ constructor(
         autoTunnelMutex.withLock {
             val settings = appDataRepository.settings.get()
             appDataRepository.settings.save(settings.copy(isAutoTunnelEnabled = true))
-            if (autoTunnelService.isCompleted) {
-                _autoTunnelActive.update { true }
-                return
+            if (_autoTunnelService.value != null) return
+            withContext(ioDispatcher) {
+                val intent = Intent(context, AutoTunnelService::class.java)
+                context.startForegroundService(intent)
+                context.bindService(intent, autoTunnelServiceConnection, Context.BIND_AUTO_CREATE)
+                withContext(mainDispatcher) { updateAutoTunnelTile() }
             }
-            runCatching {
-                    autoTunnelService = CompletableDeferred()
-                    startService(AutoTunnelService::class.java, !WireGuardAutoTunnel.isForeground())
-                    _autoTunnelActive.update { true }
-                }
-                .onFailure {
-                    Timber.e(it)
-                    _autoTunnelActive.update { false }
-                }
-            withContext(mainDispatcher) { updateAutoTunnelTile() }
         }
     }
 
@@ -84,43 +91,44 @@ constructor(
         autoTunnelMutex.withLock {
             val settings = appDataRepository.settings.get()
             appDataRepository.settings.save(settings.copy(isAutoTunnelEnabled = false))
-            if (!autoTunnelService.isCompleted) return
-            runCatching {
-                    val service = autoTunnelService.await()
-                    service.stop()
-                    _autoTunnelActive.update { false }
-                    autoTunnelService = CompletableDeferred()
+            if (_autoTunnelService.value == null) return
+            _autoTunnelService.value?.let { service ->
+                service.stop()
+                try {
+                    context.unbindService(autoTunnelServiceConnection)
+                } finally {
+                    _tunnelService.value = null
                 }
-                .onFailure { Timber.e(it) }
+            }
             withContext(mainDispatcher) { updateAutoTunnelTile() }
         }
     }
 
-    fun startTunnelForegroundService() {
-        if (backgroundService.isCompleted) return
-        runCatching {
-                backgroundService = CompletableDeferred()
-                startService(
-                    TunnelForegroundService::class.java,
-                    !WireGuardAutoTunnel.isForeground(),
-                )
+    suspend fun startTunnelForegroundService() {
+        if (_tunnelService.value != null) return
+        withContext(ioDispatcher) {
+            applicationScope.launch(ioDispatcher) {
+                val intent = Intent(context, TunnelForegroundService::class.java)
+                context.startForegroundService(intent)
+                context.bindService(intent, tunnelServiceConnection, Context.BIND_AUTO_CREATE)
             }
-            .onFailure { Timber.e(it) }
+        }
     }
 
-    suspend fun stopTunnelForegroundService() {
-        if (!backgroundService.isCompleted) return
-        runCatching {
-                val service = backgroundService.await()
-                service.stop()
-                backgroundService = CompletableDeferred()
+    fun stopTunnelForegroundService() {
+        _tunnelService.value?.let { service ->
+            service.stop()
+            try {
+                context.unbindService(tunnelServiceConnection)
+            } finally {
+                _tunnelService.value = null
             }
-            .onFailure { Timber.e(it) }
+        }
     }
 
     fun toggleAutoTunnel() {
         applicationScope.launch(ioDispatcher) {
-            if (_autoTunnelActive.value) stopAutoTunnel() else startAutoTunnel()
+            if (_autoTunnelService.value != null) stopAutoTunnel() else startAutoTunnel()
         }
     }
 
@@ -131,4 +139,12 @@ constructor(
     fun updateTunnelTile() {
         context.requestTunnelTileServiceStateUpdate()
     }
+
+    fun handleTunnelServiceDestroy() {
+        _tunnelService.update { null }
+    }
+
+    fun handleAutoTunnelServiceDestroy() {
+        _autoTunnelService.update { null }
+    }
 }

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

@@ -2,6 +2,7 @@ package com.zaneschepke.wireguardautotunnel.core.service
 
 import android.app.Notification
 import android.content.Intent
+import android.os.Binder
 import android.os.IBinder
 import androidx.core.app.ServiceCompat
 import androidx.lifecycle.LifecycleService
@@ -13,9 +14,9 @@ import com.zaneschepke.wireguardautotunnel.core.notification.NotificationManager
 import com.zaneschepke.wireguardautotunnel.core.notification.WireGuardNotification
 import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelManager
 import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
-import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
 import com.zaneschepke.wireguardautotunnel.domain.enums.NotificationAction
 import com.zaneschepke.wireguardautotunnel.domain.enums.TunnelStatus
+import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConf
 import com.zaneschepke.wireguardautotunnel.domain.repository.TunnelRepository
 import com.zaneschepke.wireguardautotunnel.domain.state.TunnelState
 import com.zaneschepke.wireguardautotunnel.util.Constants
@@ -23,23 +24,10 @@ import com.zaneschepke.wireguardautotunnel.util.extensions.distinctByKeys
 import dagger.hilt.android.AndroidEntryPoint
 import java.util.concurrent.ConcurrentHashMap
 import javax.inject.Inject
-import kotlinx.coroutines.CompletableDeferred
-import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.NonCancellable
-import kotlinx.coroutines.coroutineScope
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.collectLatest
-import kotlinx.coroutines.flow.distinctUntilChanged
-import kotlinx.coroutines.flow.filterNotNull
-import kotlinx.coroutines.flow.flowOn
-import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.isActive
-import kotlinx.coroutines.launch
+import kotlinx.coroutines.*
+import kotlinx.coroutines.flow.*
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
-import kotlinx.coroutines.withContext
 import timber.log.Timber
 
 @AndroidEntryPoint
@@ -64,9 +52,12 @@ class TunnelForegroundService : LifecycleService() {
 
     private val jobsMutex = Mutex()
 
+    class LocalBinder(val service: TunnelForegroundService) : Binder()
+
+    private val binder = LocalBinder(this)
+
     override fun onCreate() {
         super.onCreate()
-        serviceManager.backgroundService.complete(this)
         ServiceCompat.startForeground(
             this@TunnelForegroundService,
             NotificationManager.VPN_NOTIFICATION_ID,
@@ -75,14 +66,13 @@ class TunnelForegroundService : LifecycleService() {
         )
     }
 
-    override fun onBind(intent: Intent): IBinder? {
+    override fun onBind(intent: Intent): IBinder {
         super.onBind(intent)
-        return null
+        return binder
     }
 
     override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
         super.onStartCommand(intent, flags, startId)
-        serviceManager.backgroundService.complete(this)
         ServiceCompat.startForeground(
             this@TunnelForegroundService,
             NotificationManager.VPN_NOTIFICATION_ID,
@@ -163,8 +153,12 @@ class TunnelForegroundService : LifecycleService() {
             } else {
                 pingJobs[tun]?.cancel() // Cancel any stale job
                 if (tun.isPingEnabled) {
-                    pingJobs[tun] = startPingJob(tun)
-                    Timber.d("Started ping job for ${tun.tunName}")
+                    if (tun.isStaticallyConfigured()) {
+                        Timber.d("Skipping ping for statically configured tunnel")
+                    } else {
+                        pingJobs[tun] = startPingJob(tun)
+                        Timber.d("Started ping job for ${tun.tunName}")
+                    }
                 }
             }
         }
@@ -273,7 +267,7 @@ class TunnelForegroundService : LifecycleService() {
     }
 
     override fun onDestroy() {
-        serviceManager.backgroundService = CompletableDeferred()
+        serviceManager.handleTunnelServiceDestroy()
         ServiceCompat.stopForeground(this, ServiceCompat.STOP_FOREGROUND_REMOVE)
         super.onDestroy()
     }

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

@@ -1,6 +1,7 @@
 package com.zaneschepke.wireguardautotunnel.core.service.autotunnel
 
 import android.content.Intent
+import android.os.Binder
 import android.os.IBinder
 import android.os.PowerManager
 import androidx.core.app.ServiceCompat
@@ -14,12 +15,12 @@ import com.zaneschepke.wireguardautotunnel.core.notification.WireGuardNotificati
 import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
 import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelManager
 import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
-import com.zaneschepke.wireguardautotunnel.domain.entity.AppSettings
-import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
 import com.zaneschepke.wireguardautotunnel.domain.enums.BackendState
 import com.zaneschepke.wireguardautotunnel.domain.enums.NotificationAction
 import com.zaneschepke.wireguardautotunnel.domain.events.AutoTunnelEvent
 import com.zaneschepke.wireguardautotunnel.domain.events.KillSwitchEvent
+import com.zaneschepke.wireguardautotunnel.domain.model.AppSettings
+import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConf
 import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
 import com.zaneschepke.wireguardautotunnel.domain.state.AutoTunnelState
 import com.zaneschepke.wireguardautotunnel.domain.state.NetworkState
@@ -28,21 +29,8 @@ import com.zaneschepke.wireguardautotunnel.util.extensions.Tunnels
 import dagger.hilt.android.AndroidEntryPoint
 import javax.inject.Inject
 import javax.inject.Provider
-import kotlinx.coroutines.CompletableDeferred
-import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.FlowPreview
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.combine
-import kotlinx.coroutines.flow.debounce
-import kotlinx.coroutines.flow.distinctUntilChanged
-import kotlinx.coroutines.flow.flatMapLatest
-import kotlinx.coroutines.flow.flowOn
-import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.flow.update
-import kotlinx.coroutines.launch
+import kotlinx.coroutines.*
+import kotlinx.coroutines.flow.*
 import timber.log.Timber
 
 @AndroidEntryPoint
@@ -68,26 +56,32 @@ class AutoTunnelService : LifecycleService() {
 
     private var killSwitchJob: Job? = null
 
+    class LocalBinder(val service: AutoTunnelService) : Binder()
+
+    private val binder = LocalBinder(this)
+
+    private var isServiceRunning = false
+
     override fun onCreate() {
         super.onCreate()
-        serviceManager.autoTunnelService.complete(this)
         launchWatcherNotification()
     }
 
-    override fun onBind(intent: Intent): IBinder? {
+    override fun onBind(intent: Intent): IBinder {
         super.onBind(intent)
-        return null
+        return binder
     }
 
     override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
         super.onStartCommand(intent, flags, startId)
         Timber.d("onStartCommand executed with startId: $startId")
-        serviceManager.autoTunnelService.complete(this)
         start()
         return START_STICKY
     }
 
     fun start() {
+        if (isServiceRunning) return
+        isServiceRunning = true
         kotlin
             .runCatching {
                 launchWatcherNotification()
@@ -100,12 +94,13 @@ class AutoTunnelService : LifecycleService() {
     }
 
     fun stop() {
+        isServiceRunning = false
         wakeLock?.let { if (it.isHeld) it.release() }
         stopSelf()
     }
 
     override fun onDestroy() {
-        serviceManager.autoTunnelService = CompletableDeferred()
+        serviceManager.handleAutoTunnelServiceDestroy()
         restoreVpnKillSwitch()
         super.onDestroy()
     }
@@ -259,18 +254,44 @@ class AutoTunnelService : LifecycleService() {
         lifecycleScope.launch(ioDispatcher) {
             Timber.i("Starting auto-tunnel network event watcher")
             val settings = appDataRepository.get().settings.get()
-            Timber.d("Starting with debounce delay of: ${settings.debounceDelaySeconds} seconds")
+
+            var reevaluationJob: Job? = null
+
             autoTunnelStateFlow.debounce(settings.debounceDelayMillis()).collect { watcherState ->
                 if (watcherState == defaultState) return@collect
-                Timber.d("New auto tunnel state emitted ${watcherState.networkState}")
-                when (val event = watcherState.asAutoTunnelEvent()) {
-                    is AutoTunnelEvent.Start ->
-                        (event.tunnelConf ?: appDataRepository.get().getPrimaryOrFirstTunnel())
-                            ?.let { tunnelManager.startTunnel(it) }
-                    // TODO improve this to target specific tunnels to better support multi-tunnel
-                    is AutoTunnelEvent.Stop -> tunnelManager.stopTunnel()
-                    AutoTunnelEvent.DoNothing -> Timber.i("Auto-tunneling: no condition met")
+                reevaluationJob?.cancel()
+                handleAutoTunnelEvent(watcherState)
+
+                // schedule one-time re-evaluation
+                reevaluationJob = launch {
+                    delay(REEVALUATE_CHECK_DELAY)
+                    if (watcherState != defaultState) {
+                        Timber.d("Re-evaluating auto-tunnel state..")
+                        handleAutoTunnelEvent(watcherState)
+                    }
                 }
             }
         }
+
+    private suspend fun handleAutoTunnelEvent(watcherState: AutoTunnelState) {
+        Timber.i("Auto-tunnel settings: ${watcherState.settings.toAutoTunnelStateString()}")
+        Timber.i("Auto-tunnel network state: ${watcherState.networkState}")
+        when (
+            val event =
+                watcherState.asAutoTunnelEvent().also {
+                    Timber.i("Auto-tunnel event: ${it.javaClass.simpleName}")
+                }
+        ) {
+            is AutoTunnelEvent.Start ->
+                (event.tunnelConf ?: appDataRepository.get().getPrimaryOrFirstTunnel())?.let {
+                    tunnelManager.startTunnel(it)
+                }
+            is AutoTunnelEvent.Stop -> tunnelManager.stopTunnel()
+            AutoTunnelEvent.DoNothing -> Timber.i("Auto-tunneling: nothing to do")
+        }
+    }
+
+    companion object {
+        const val REEVALUATE_CHECK_DELAY = 5_000L
+    }
 }

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

@@ -38,8 +38,8 @@ class AutoTunnelControlTile : TileService(), LifecycleOwner {
         lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_START)
         Timber.d("Start listening called for auto tunnel tile")
         lifecycleScope.launch {
-            serviceManager.autoTunnelActive.collect {
-                if (it) return@collect setActive()
+            serviceManager.autoTunnelService.collect {
+                if (it != null) return@collect setActive()
                 setInactive()
             }
         }
@@ -56,7 +56,7 @@ class AutoTunnelControlTile : TileService(), LifecycleOwner {
         super.onClick()
         unlockAndRun {
             lifecycleScope.launch {
-                if (serviceManager.autoTunnelActive.value) {
+                if (serviceManager.autoTunnelService.value != null) {
                     serviceManager.stopAutoTunnel()
                     setInactive()
                 } else {

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

@@ -13,7 +13,7 @@ import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.WireGuardAutoTunnel
 import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
 import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelManager
-import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
+import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConf
 import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
 import com.zaneschepke.wireguardautotunnel.domain.state.TunnelState
 import dagger.hilt.android.AndroidEntryPoint

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

@@ -1,24 +1,20 @@
 package com.zaneschepke.wireguardautotunnel.core.tunnel
 
-import com.wireguard.android.backend.BackendException
 import com.wireguard.android.backend.Tunnel
 import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
 import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
-import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
 import com.zaneschepke.wireguardautotunnel.domain.enums.BackendError
 import com.zaneschepke.wireguardautotunnel.domain.enums.TunnelStatus
+import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConf
 import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
 import com.zaneschepke.wireguardautotunnel.domain.state.TunnelState
 import com.zaneschepke.wireguardautotunnel.domain.state.TunnelStatistics
 import com.zaneschepke.wireguardautotunnel.util.extensions.asTunnelState
-import com.zaneschepke.wireguardautotunnel.util.extensions.toBackendError
 import java.util.concurrent.ConcurrentHashMap
 import kotlin.concurrent.thread
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.delay
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.asStateFlow
-import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.flow.*
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.sync.Mutex
@@ -31,6 +27,10 @@ abstract class BaseTunnel(
     private val serviceManager: ServiceManager,
 ) : TunnelProvider {
 
+    private val _errorEvents =
+        MutableSharedFlow<Pair<TunnelConf, BackendError>>(replay = 0, extraBufferCapacity = 1)
+    override val errorEvents = _errorEvents.asSharedFlow()
+
     private val activeTuns = MutableStateFlow<Map<TunnelConf, TunnelState>>(emptyMap())
     private val tunThreads = ConcurrentHashMap<Int, Thread>()
     override val activeTunnels = activeTuns.asStateFlow()
@@ -45,37 +45,34 @@ abstract class BaseTunnel(
 
     abstract fun stopBackend(tunnel: TunnelConf)
 
-    override suspend fun clearError(tunnelConf: TunnelConf) =
-        updateTunnelStatus(tunnelConf, TunnelStatus.Down)
-
     override fun hasVpnPermission(): Boolean {
         return serviceManager.hasVpnPermission()
     }
 
     protected suspend fun updateTunnelStatus(
         tunnelConf: TunnelConf,
-        state: TunnelStatus? = null,
+        status: TunnelStatus? = null,
         stats: TunnelStatistics? = null,
     ) {
         tunStatusMutex.withLock {
-            activeTuns.update { current ->
-                val originalConf = current.getKeyById(tunnelConf.id) ?: tunnelConf
-                val existingState = current.getValueById(tunnelConf.id) ?: TunnelState()
-                val newState = state ?: existingState.status
+            activeTuns.update { currentTuns ->
+                val originalConf = currentTuns.getKeyById(tunnelConf.id) ?: tunnelConf
+                val existingState = currentTuns.getValueById(tunnelConf.id) ?: TunnelState()
+                val newState = status ?: existingState.status
                 if (newState == TunnelStatus.Down) {
                     Timber.d("Removing tunnel ${tunnelConf.id} from activeTunnels as state is DOWN")
                     cleanUpTunThread(tunnelConf)
-                    current - originalConf
+                    currentTuns - originalConf
                 } else if (existingState.status == newState && stats == null) {
                     Timber.d("Skipping redundant state update for ${tunnelConf.id}: $newState")
-                    current
+                    currentTuns
                 } else {
                     val updated =
                         existingState.copy(
                             status = newState,
                             statistics = stats ?: existingState.statistics,
                         )
-                    current + (originalConf to updated)
+                    currentTuns + (originalConf to updated)
                 }
             }
         }
@@ -117,23 +114,17 @@ abstract class BaseTunnel(
         if (this@BaseTunnel is UserspaceTunnel) stopActiveTunnels()
         tunMutex.withLock {
             tunThreads[tunnelConf.id] = thread {
-                runCatching {
-                        runBlocking {
-                            try {
-                                Timber.d("Starting tunnel ${tunnelConf.id}...")
-                                startTunnelInner(tunnelConf)
-                                Timber.d("Started complete for tunnel ${tunnelConf.name}...")
-                            } catch (e: BackendError) {
-                                Timber.e(e, "Failed to start tunnel ${tunnelConf.name} userspace")
-                                updateTunnelStatus(tunnelConf, TunnelStatus.Error(e))
-                            } catch (e: InterruptedException) {
-                                Timber.w(
-                                    "Tunnel start has been interrupted as ${tunnelConf.name} failed to start"
-                                )
-                            }
-                        }
+                try {
+                    runBlocking {
+                        Timber.d("Starting tunnel ${tunnelConf.id}...")
+                        startTunnelInner(tunnelConf)
+                        Timber.d("Started complete for tunnel ${tunnelConf.name}...")
                     }
-                    .onFailure { Timber.w("Tunnel start has been interrupted") }
+                } catch (e: InterruptedException) {
+                    Timber.w(
+                        "Tunnel start has been interrupted as ${tunnelConf.name} failed to start"
+                    )
+                }
             }
         }
     }
@@ -147,11 +138,10 @@ abstract class BaseTunnel(
             Timber.d("Started for tun ${tunnelConf.id}...")
             saveTunnelActiveState(tunnelConf, true)
             serviceManager.startTunnelForegroundService()
-        } catch (e: BackendException) {
+        } catch (e: BackendError) {
             Timber.e(e, "Failed to start backend for ${tunnelConf.name}")
-            val backendError = e.toBackendError()
-            updateTunnelStatus(tunnelConf, TunnelStatus.Error(backendError))
-            throw backendError
+            _errorEvents.emit(tunnelConf to e)
+            updateTunnelStatus(tunnelConf, TunnelStatus.Down)
         }
     }
 
@@ -163,26 +153,27 @@ abstract class BaseTunnel(
     override suspend fun stopTunnel(tunnelConf: TunnelConf?, reason: TunnelStatus.StopReason) {
         if (tunnelConf == null) return stopActiveTunnels()
         tunMutex.withLock {
-            try {
-                if (activeTuns.isStarting(tunnelConf.id))
-                    return handleStuckStartingTunnelShutdown(tunnelConf)
-                updateTunnelStatus(tunnelConf, TunnelStatus.Stopping(reason))
-                stopTunnelInner(tunnelConf)
-            } catch (e: BackendError) {
-                Timber.e(e, "Failed to stop tunnel ${tunnelConf.id}")
-                updateTunnelStatus(tunnelConf, TunnelStatus.Error(e))
-            }
+            if (activeTuns.isStarting(tunnelConf.id))
+                return handleStuckStartingTunnelShutdown(tunnelConf)
+            updateTunnelStatus(tunnelConf, TunnelStatus.Stopping(reason))
+            stopTunnelInner(tunnelConf)
         }
     }
 
     private suspend fun stopTunnelInner(tunnelConf: TunnelConf) {
-        val tunnel = activeTuns.findTunnel(tunnelConf.id) ?: return
-        stopBackend(tunnel)
-        saveTunnelActiveState(tunnelConf, false)
-        removeActiveTunnel(tunnel)
+        try {
+            val tunnel = activeTuns.findTunnel(tunnelConf.id) ?: return
+            stopBackend(tunnel)
+            saveTunnelActiveState(tunnelConf, false)
+            removeActiveTunnel(tunnel)
+        } catch (e: BackendError) {
+            Timber.e(e, "Failed to stop tunnel ${tunnelConf.id}")
+            _errorEvents.emit(tunnelConf to e)
+            updateTunnelStatus(tunnelConf, TunnelStatus.Down)
+        }
     }
 
-    private suspend fun handleServiceStateOnChange() {
+    private fun handleServiceStateOnChange() {
         if (activeTuns.value.isEmpty() && bouncingTunnelIds.isEmpty())
             serviceManager.stopTunnelForegroundService()
     }
@@ -193,15 +184,15 @@ abstract class BaseTunnel(
             tunThreads[tunnel.id]?.let {
                 if (it.state != Thread.State.TERMINATED) {
                     it.interrupt()
-                    updateTunnelStatus(tunnel, TunnelStatus.Down)
                 } else {
                     Timber.d("Thread already terminated")
                 }
             }
         } catch (e: Exception) {
             Timber.e(e, "Failed to stop tunnel thread for ${tunnel.name}")
+        } finally {
+            updateTunnelStatus(tunnel, TunnelStatus.Down)
         }
-        cleanUpTunThread(tunnel)
     }
 
     private fun cleanUpTunThread(tunnel: TunnelConf) {
@@ -221,7 +212,7 @@ abstract class BaseTunnel(
             bouncingTunnelIds[tunnelConf.id] = reason
             try {
                 stopTunnel(tunnelConf, reason)
-                delay(300L)
+                delay(BOUNCE_DELAY)
                 startTunnel(tunnelConf)
             } finally {
                 bouncingTunnelIds.remove(tunnelConf.id)
@@ -235,4 +226,8 @@ abstract class BaseTunnel(
 
     override suspend fun runningTunnelNames(): Set<String> =
         activeTuns.value.keys.map { it.tunName }.toSet()
+
+    companion object {
+        const val BOUNCE_DELAY = 300L
+    }
 }

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

@@ -1,7 +1,7 @@
 package com.zaneschepke.wireguardautotunnel.core.tunnel
 
-import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
 import com.zaneschepke.wireguardautotunnel.domain.enums.TunnelStatus
+import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConf
 import com.zaneschepke.wireguardautotunnel.domain.state.TunnelState
 import kotlinx.coroutines.flow.MutableStateFlow
 

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

@@ -5,9 +5,9 @@ import com.wireguard.android.backend.BackendException
 import com.wireguard.android.backend.Tunnel
 import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
 import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
-import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
 import com.zaneschepke.wireguardautotunnel.domain.enums.BackendState
 import com.zaneschepke.wireguardautotunnel.domain.enums.TunnelStatus
+import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConf
 import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
 import com.zaneschepke.wireguardautotunnel.domain.state.TunnelStatistics
 import com.zaneschepke.wireguardautotunnel.domain.state.WireGuardStatistics

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

@@ -4,9 +4,10 @@ import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
 import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
 import com.zaneschepke.wireguardautotunnel.di.Kernel
 import com.zaneschepke.wireguardautotunnel.di.Userspace
-import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
+import com.zaneschepke.wireguardautotunnel.domain.enums.BackendError
 import com.zaneschepke.wireguardautotunnel.domain.enums.BackendState
 import com.zaneschepke.wireguardautotunnel.domain.enums.TunnelStatus
+import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConf
 import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
 import com.zaneschepke.wireguardautotunnel.domain.state.TunnelStatistics
 import java.util.concurrent.ConcurrentHashMap
@@ -15,6 +16,7 @@ import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.SharedFlow
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.filterNotNull
 import kotlinx.coroutines.flow.flatMapLatest
@@ -62,6 +64,9 @@ constructor(
                 initialValue = emptyMap(),
             )
 
+    override val errorEvents: SharedFlow<Pair<TunnelConf, BackendError>>
+        get() = tunnelProviderFlow.value.errorEvents
+
     override val bouncingTunnelIds: ConcurrentHashMap<Int, TunnelStatus.StopReason> =
         tunnelProviderFlow.value.bouncingTunnelIds
 
@@ -69,10 +74,6 @@ constructor(
         return userspaceTunnel.hasVpnPermission()
     }
 
-    override suspend fun clearError(tunnelConf: TunnelConf) {
-        tunnelProviderFlow.value.clearError(tunnelConf)
-    }
-
     override suspend fun updateTunnelStatistics(tunnel: TunnelConf) {
         tunnelProviderFlow.value.updateTunnelStatistics(tunnel)
     }

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

@@ -1,11 +1,13 @@
 package com.zaneschepke.wireguardautotunnel.core.tunnel
 
-import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
+import com.zaneschepke.wireguardautotunnel.domain.enums.BackendError
 import com.zaneschepke.wireguardautotunnel.domain.enums.BackendState
 import com.zaneschepke.wireguardautotunnel.domain.enums.TunnelStatus
+import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConf
 import com.zaneschepke.wireguardautotunnel.domain.state.TunnelState
 import com.zaneschepke.wireguardautotunnel.domain.state.TunnelStatistics
 import java.util.concurrent.ConcurrentHashMap
+import kotlinx.coroutines.flow.SharedFlow
 import kotlinx.coroutines.flow.StateFlow
 
 interface TunnelProvider {
@@ -46,11 +48,11 @@ interface TunnelProvider {
 
     val activeTunnels: StateFlow<Map<TunnelConf, TunnelState>>
 
+    val errorEvents: SharedFlow<Pair<TunnelConf, BackendError>>
+
     val bouncingTunnelIds: ConcurrentHashMap<Int, TunnelStatus.StopReason>
 
     fun hasVpnPermission(): Boolean
 
-    suspend fun clearError(tunnelConf: TunnelConf)
-
     suspend fun updateTunnelStatistics(tunnel: TunnelConf)
 }

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

@@ -2,9 +2,9 @@ package com.zaneschepke.wireguardautotunnel.core.tunnel
 
 import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
 import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
-import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
 import com.zaneschepke.wireguardautotunnel.domain.enums.BackendState
 import com.zaneschepke.wireguardautotunnel.domain.enums.TunnelStatus
+import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConf
 import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
 import com.zaneschepke.wireguardautotunnel.domain.state.AmneziaStatistics
 import com.zaneschepke.wireguardautotunnel.domain.state.TunnelStatistics
@@ -50,8 +50,9 @@ constructor(
         } catch (e: BackendException) {
             Timber.e(e, "Failed to stop tunnel ${tunnel.id}")
             throw e.toBackendError()
+        } finally {
+            handlePreviouslyEnabledVpnKillSwitch()
         }
-        handlePreviouslyEnabledVpnKillSwitch()
     }
 
     // stop vpn kill switch if we need to resolve DNS for peer endpoints
@@ -69,7 +70,7 @@ constructor(
     // restore vpn kill switch if needed
     private fun handlePreviouslyEnabledVpnKillSwitch() {
         // let auto tunnel handle this if it is active
-        if (!serviceManager.autoTunnelActive.value) {
+        if (serviceManager.autoTunnelService.value == null) {
             previousBackendState?.let { (state, lanEnabled) ->
                 Timber.d("Restoring kill switch configuration")
                 val lan = if (lanEnabled) TunnelConf.LAN_BYPASS_ALLOWED_IPS else emptyList()

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

@@ -57,7 +57,7 @@ constructor(
         withContext(ioDispatcher) {
             Timber.i("Service worker started")
             with(appDataRepository.settings.get()) {
-                if (isAutoTunnelEnabled && !serviceManager.autoTunnelActive.value)
+                if (isAutoTunnelEnabled && serviceManager.autoTunnelService.value == null)
                     return@with serviceManager.startAutoTunnel()
                 if (tunnelManager.activeTunnels.value.isEmpty())
                     tunnelManager.restorePreviousState()

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

@@ -8,12 +8,12 @@ import androidx.room.TypeConverters
 import androidx.room.migration.AutoMigrationSpec
 import com.zaneschepke.wireguardautotunnel.data.dao.SettingsDao
 import com.zaneschepke.wireguardautotunnel.data.dao.TunnelConfigDao
-import com.zaneschepke.wireguardautotunnel.data.model.Settings
-import com.zaneschepke.wireguardautotunnel.data.model.TunnelConfig
+import com.zaneschepke.wireguardautotunnel.data.entity.Settings
+import com.zaneschepke.wireguardautotunnel.data.entity.TunnelConfig
 
 @Database(
     entities = [Settings::class, TunnelConfig::class],
-    version = 16,
+    version = 17,
     autoMigrations =
         [
             AutoMigration(from = 1, to = 2),
@@ -31,10 +31,11 @@ import com.zaneschepke.wireguardautotunnel.data.model.TunnelConfig
             AutoMigration(from = 13, to = 14),
             AutoMigration(from = 14, to = 15),
             AutoMigration(from = 15, to = 16),
+            AutoMigration(from = 16, to = 17, spec = WifiDetectionMigration::class),
         ],
     exportSchema = true,
 )
-@TypeConverters(DatabaseListConverters::class)
+@TypeConverters(DatabaseConverters::class)
 abstract class AppDatabase : RoomDatabase() {
     abstract fun settingDao(): SettingsDao
 
@@ -47,3 +48,6 @@ class RemoveLegacySettingColumnsMigration : AutoMigrationSpec
 
 @DeleteColumn(tableName = "Settings", columnName = "is_auto_tunnel_paused")
 class RemoveTunnelPauseMigration : AutoMigrationSpec
+
+@DeleteColumn(tableName = "Settings", columnName = "is_wifi_by_shell_enabled")
+class WifiDetectionMigration : AutoMigrationSpec

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

@@ -1,9 +1,10 @@
 package com.zaneschepke.wireguardautotunnel.data
 
 import androidx.room.TypeConverter
+import com.zaneschepke.wireguardautotunnel.data.entity.Settings
 import kotlinx.serialization.json.Json
 
-class DatabaseListConverters {
+class DatabaseConverters {
     @TypeConverter
     fun listToString(value: MutableList<String>): String {
         return Json.encodeToString(value)
@@ -20,4 +21,10 @@ class DatabaseListConverters {
             Json.decodeFromString<MutableList<String>>(json)
         }
     }
+
+    @TypeConverter fun fromStatus(status: Settings.WifiDetectionMethod): Int = status.value
+
+    @TypeConverter
+    fun toStatus(value: Int): Settings.WifiDetectionMethod =
+        Settings.WifiDetectionMethod.fromValue(value)
 }

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

@@ -5,7 +5,7 @@ import androidx.room.Delete
 import androidx.room.Insert
 import androidx.room.OnConflictStrategy
 import androidx.room.Query
-import com.zaneschepke.wireguardautotunnel.data.model.Settings
+import com.zaneschepke.wireguardautotunnel.data.entity.Settings
 import kotlinx.coroutines.flow.Flow
 
 @Dao

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

@@ -5,7 +5,7 @@ import androidx.room.Delete
 import androidx.room.Insert
 import androidx.room.OnConflictStrategy
 import androidx.room.Query
-import com.zaneschepke.wireguardautotunnel.data.model.TunnelConfig
+import com.zaneschepke.wireguardautotunnel.data.entity.TunnelConfig
 import com.zaneschepke.wireguardautotunnel.util.extensions.TunnelConfigs
 import kotlinx.coroutines.flow.Flow
 

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

@@ -1,4 +1,4 @@
-package com.zaneschepke.wireguardautotunnel.data.model
+package com.zaneschepke.wireguardautotunnel.data.entity
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable

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

@@ -0,0 +1,24 @@
+package com.zaneschepke.wireguardautotunnel.data.entity
+
+import com.zaneschepke.wireguardautotunnel.ui.theme.Theme
+
+data class GeneralState(
+    val isLocationDisclosureShown: Boolean = LOCATION_DISCLOSURE_SHOWN_DEFAULT,
+    val isBatteryOptimizationDisableShown: Boolean = BATTERY_OPTIMIZATION_DISABLE_SHOWN_DEFAULT,
+    val isPinLockEnabled: Boolean = PIN_LOCK_ENABLED_DEFAULT,
+    val expandedTunnelIds: List<Int> = emptyList(),
+    val isLocalLogsEnabled: Boolean = IS_LOGS_ENABLED_DEFAULT,
+    val isRemoteControlEnabled: Boolean = IS_REMOTE_CONTROL_ENABLED,
+    val remoteKey: String? = null,
+    val locale: String? = null,
+    val theme: Theme = Theme.AUTOMATIC,
+) {
+
+    companion object {
+        const val LOCATION_DISCLOSURE_SHOWN_DEFAULT = false
+        const val BATTERY_OPTIMIZATION_DISABLE_SHOWN_DEFAULT = false
+        const val PIN_LOCK_ENABLED_DEFAULT = false
+        const val IS_LOGS_ENABLED_DEFAULT = false
+        const val IS_REMOTE_CONTROL_ENABLED = false
+    }
+}

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

@@ -0,0 +1,12 @@
+package com.zaneschepke.wireguardautotunnel.data.entity
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class GitHubRelease(
+    @SerialName("tag_name") val tagName: String,
+    val name: String?,
+    val body: String?,
+    val assets: List<Asset>,
+)

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

@@ -1,9 +1,8 @@
-package com.zaneschepke.wireguardautotunnel.data.model
+package com.zaneschepke.wireguardautotunnel.data.entity
 
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
-import com.zaneschepke.wireguardautotunnel.domain.entity.AppSettings
 
 @Entity
 data class Settings(
@@ -32,8 +31,6 @@ data class Settings(
     val isAmneziaEnabled: Boolean = false,
     @ColumnInfo(name = "is_wildcards_enabled", defaultValue = "false")
     val isWildcardsEnabled: Boolean = false,
-    @ColumnInfo(name = "is_wifi_by_shell_enabled", defaultValue = "false")
-    val isWifiNameByShellEnabled: Boolean = false,
     @ColumnInfo(name = "is_stop_on_no_internet_enabled", defaultValue = "false")
     val isStopOnNoInternetEnabled: Boolean = false,
     @ColumnInfo(name = "is_vpn_kill_switch_enabled", defaultValue = "false")
@@ -46,61 +43,23 @@ data class Settings(
     val debounceDelaySeconds: Int = 3,
     @ColumnInfo(name = "is_disable_kill_switch_on_trusted_enabled", defaultValue = "false")
     val isDisableKillSwitchOnTrustedEnabled: Boolean = false,
+    @ColumnInfo(name = "is_tunnel_on_unsecure_enabled", defaultValue = "false")
+    val isTunnelOnUnsecureEnabled: Boolean = false,
+    @ColumnInfo(name = "split_tunnel_apps", defaultValue = "")
+    val splitTunnelApps: MutableList<String> = mutableListOf(),
+    @ColumnInfo(name = "wifi_detection_method", defaultValue = "0")
+    val wifiDetectionMethod: WifiDetectionMethod = WifiDetectionMethod.fromValue(0),
 ) {
 
-    fun toAppSettings(): AppSettings {
-        return AppSettings(
-            id,
-            isAutoTunnelEnabled,
-            isTunnelOnMobileDataEnabled,
-            trustedNetworkSSIDs,
-            isAlwaysOnVpnEnabled,
-            isTunnelOnEthernetEnabled,
-            isShortcutsEnabled,
-            isTunnelOnWifiEnabled,
-            isKernelEnabled,
-            isRestoreOnBootEnabled,
-            isMultiTunnelEnabled,
-            isPingEnabled,
-            isAmneziaEnabled,
-            isWildcardsEnabled,
-            isWifiNameByShellEnabled,
-            isStopOnNoInternetEnabled,
-            isVpnKillSwitchEnabled,
-            isKernelKillSwitchEnabled,
-            isLanOnKillSwitchEnabled,
-            debounceDelaySeconds,
-            isDisableKillSwitchOnTrustedEnabled,
-        )
-    }
+    enum class WifiDetectionMethod(val value: Int) {
+        DEFAULT(0),
+        LEGACY(1),
+        ROOT(2),
+        SHIZUKU(3);
 
-    companion object {
-        fun from(appSettings: AppSettings): Settings {
-            return with(appSettings) {
-                Settings(
-                    id,
-                    isAutoTunnelEnabled,
-                    isTunnelOnMobileDataEnabled,
-                    trustedNetworkSSIDs.toMutableList(),
-                    isAlwaysOnVpnEnabled,
-                    isTunnelOnEthernetEnabled,
-                    isShortcutsEnabled,
-                    isTunnelOnWifiEnabled,
-                    isKernelEnabled,
-                    isRestoreOnBootEnabled,
-                    isMultiTunnelEnabled,
-                    isPingEnabled,
-                    isAmneziaEnabled,
-                    isWildcardsEnabled,
-                    isWifiNameByShellEnabled,
-                    isStopOnNoInternetEnabled,
-                    isVpnKillSwitchEnabled,
-                    isKernelKillSwitchEnabled,
-                    isLanOnKillSwitchEnabled,
-                    debounceDelaySeconds,
-                    isDisableKillSwitchOnTrustedEnabled,
-                )
-            }
+        companion object {
+            fun fromValue(value: Int): WifiDetectionMethod =
+                entries.find { it.value == value } ?: DEFAULT
         }
     }
 }

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

@@ -1,10 +1,9 @@
-package com.zaneschepke.wireguardautotunnel.data.model
+package com.zaneschepke.wireguardautotunnel.data.entity
 
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.Index
 import androidx.room.PrimaryKey
-import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
 
 @Entity(indices = [Index(value = ["name"], unique = true)])
 data class TunnelConfig(
@@ -30,48 +29,7 @@ data class TunnelConfig(
     var isIpv4Preferred: Boolean = true,
 ) {
 
-    fun toTunnel(): TunnelConf {
-        return TunnelConf(
-            id,
-            name,
-            wgQuick,
-            tunnelNetworks,
-            isMobileDataTunnel,
-            isPrimaryTunnel,
-            amQuick,
-            isActive,
-            isPingEnabled,
-            pingInterval,
-            pingCooldown,
-            pingIp,
-            isEthernetTunnel,
-            isIpv4Preferred,
-        )
-    }
-
     companion object {
-
         const val AM_QUICK_DEFAULT = ""
-
-        fun from(tunnelConf: TunnelConf): TunnelConfig {
-            return with(tunnelConf) {
-                return TunnelConfig(
-                    id,
-                    tunName,
-                    wgQuick,
-                    tunnelNetworks.toMutableList(),
-                    isMobileDataTunnel,
-                    isPrimaryTunnel,
-                    amQuick,
-                    isActive,
-                    isPingEnabled,
-                    pingInterval,
-                    pingCooldown,
-                    pingIp,
-                    isEthernetTunnel,
-                    isIpv4Preferred,
-                )
-            }
-        }
     }
 }

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

@@ -0,0 +1,37 @@
+package com.zaneschepke.wireguardautotunnel.data.mapper
+
+import com.zaneschepke.wireguardautotunnel.data.entity.GeneralState
+import com.zaneschepke.wireguardautotunnel.domain.model.AppState
+
+object GeneralStateMapper {
+    fun toAppState(generalState: GeneralState): AppState =
+        with(generalState) {
+            AppState(
+                isLocationDisclosureShown,
+                isBatteryOptimizationDisableShown,
+                isPinLockEnabled,
+                expandedTunnelIds,
+                isLocalLogsEnabled,
+                isRemoteControlEnabled,
+                remoteKey,
+                locale,
+                theme,
+            )
+        }
+
+    fun toGeneralState(appState: AppState): GeneralState {
+        return with(appState) {
+            GeneralState(
+                isLocationDisclosureShown,
+                isBatteryOptimizationDisableShown,
+                isPinLockEnabled,
+                expandedTunnelIds,
+                isLocalLogsEnabled,
+                isRemoteControlEnabled,
+                remoteKey,
+                locale,
+                theme,
+            )
+        }
+    }
+}

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

@@ -0,0 +1,20 @@
+package com.zaneschepke.wireguardautotunnel.data.mapper
+
+import com.zaneschepke.wireguardautotunnel.data.entity.GitHubRelease
+import com.zaneschepke.wireguardautotunnel.domain.model.AppUpdate
+import kotlin.collections.firstOrNull
+
+object GitHubReleaseMapper {
+    fun toAppUpdate(gitHubRelease: GitHubRelease, newVersion: String): AppUpdate {
+        with(gitHubRelease) {
+            val apkAsset = assets.firstOrNull { it.name.endsWith(".apk") }
+            return AppUpdate(
+                version = newVersion,
+                title = name ?: "Update $tagName",
+                releaseNotes = body ?: "No release notes provided",
+                apkUrl = apkAsset?.browserDownloadUrl,
+                apkFileName = apkAsset?.name,
+            )
+        }
+    }
+}

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

@@ -0,0 +1,67 @@
+package com.zaneschepke.wireguardautotunnel.data.mapper
+
+import com.zaneschepke.networkmonitor.AndroidNetworkMonitor
+import com.zaneschepke.wireguardautotunnel.data.entity.Settings
+import com.zaneschepke.wireguardautotunnel.domain.model.AppSettings
+
+object SettingsMapper {
+    fun toAppSettings(settings: Settings): AppSettings {
+        return AppSettings(
+            id = settings.id,
+            isAutoTunnelEnabled = settings.isAutoTunnelEnabled,
+            isTunnelOnMobileDataEnabled = settings.isTunnelOnMobileDataEnabled,
+            trustedNetworkSSIDs = settings.trustedNetworkSSIDs,
+            isAlwaysOnVpnEnabled = settings.isAlwaysOnVpnEnabled,
+            isTunnelOnEthernetEnabled = settings.isTunnelOnEthernetEnabled,
+            isShortcutsEnabled = settings.isShortcutsEnabled,
+            isTunnelOnWifiEnabled = settings.isTunnelOnWifiEnabled,
+            isKernelEnabled = settings.isKernelEnabled,
+            isRestoreOnBootEnabled = settings.isRestoreOnBootEnabled,
+            isMultiTunnelEnabled = settings.isMultiTunnelEnabled,
+            isPingEnabled = settings.isPingEnabled,
+            isAmneziaEnabled = settings.isAmneziaEnabled,
+            isWildcardsEnabled = settings.isWildcardsEnabled,
+            isStopOnNoInternetEnabled = settings.isStopOnNoInternetEnabled,
+            isVpnKillSwitchEnabled = settings.isVpnKillSwitchEnabled,
+            isKernelKillSwitchEnabled = settings.isKernelKillSwitchEnabled,
+            isLanOnKillSwitchEnabled = settings.isLanOnKillSwitchEnabled,
+            debounceDelaySeconds = settings.debounceDelaySeconds,
+            isDisableKillSwitchOnTrustedEnabled = settings.isDisableKillSwitchOnTrustedEnabled,
+            isTunnelOnUnsecureEnabled = settings.isTunnelOnUnsecureEnabled,
+            splitTunnelApps = settings.splitTunnelApps,
+            wifiDetectionMethod =
+                AndroidNetworkMonitor.WifiDetectionMethod.fromValue(
+                    settings.wifiDetectionMethod.value
+                ),
+        )
+    }
+
+    fun toSettings(appSettings: AppSettings): Settings {
+        return Settings(
+            id = appSettings.id,
+            isAutoTunnelEnabled = appSettings.isAutoTunnelEnabled,
+            isTunnelOnMobileDataEnabled = appSettings.isTunnelOnMobileDataEnabled,
+            trustedNetworkSSIDs = appSettings.trustedNetworkSSIDs.toMutableList(),
+            isAlwaysOnVpnEnabled = appSettings.isAlwaysOnVpnEnabled,
+            isTunnelOnEthernetEnabled = appSettings.isTunnelOnEthernetEnabled,
+            isShortcutsEnabled = appSettings.isShortcutsEnabled,
+            isTunnelOnWifiEnabled = appSettings.isTunnelOnWifiEnabled,
+            isKernelEnabled = appSettings.isKernelEnabled,
+            isRestoreOnBootEnabled = appSettings.isRestoreOnBootEnabled,
+            isMultiTunnelEnabled = appSettings.isMultiTunnelEnabled,
+            isPingEnabled = appSettings.isPingEnabled,
+            isAmneziaEnabled = appSettings.isAmneziaEnabled,
+            isWildcardsEnabled = appSettings.isWildcardsEnabled,
+            isStopOnNoInternetEnabled = appSettings.isStopOnNoInternetEnabled,
+            isVpnKillSwitchEnabled = appSettings.isVpnKillSwitchEnabled,
+            isKernelKillSwitchEnabled = appSettings.isKernelKillSwitchEnabled,
+            isLanOnKillSwitchEnabled = appSettings.isLanOnKillSwitchEnabled,
+            debounceDelaySeconds = appSettings.debounceDelaySeconds,
+            isDisableKillSwitchOnTrustedEnabled = appSettings.isDisableKillSwitchOnTrustedEnabled,
+            isTunnelOnUnsecureEnabled = appSettings.isTunnelOnUnsecureEnabled,
+            splitTunnelApps = appSettings.splitTunnelApps.toMutableList(),
+            wifiDetectionMethod =
+                Settings.WifiDetectionMethod.fromValue(appSettings.wifiDetectionMethod.value),
+        )
+    }
+}

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

@@ -0,0 +1,48 @@
+package com.zaneschepke.wireguardautotunnel.data.mapper
+
+import com.zaneschepke.wireguardautotunnel.data.entity.TunnelConfig
+import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConf
+
+object TunnelConfigMapper {
+    fun toTunnelConf(tunnelConfig: TunnelConfig): TunnelConf {
+        return with(tunnelConfig) {
+            TunnelConf(
+                id,
+                name,
+                wgQuick,
+                tunnelNetworks,
+                isMobileDataTunnel,
+                isPrimaryTunnel,
+                amQuick,
+                isActive,
+                isPingEnabled,
+                pingInterval,
+                pingCooldown,
+                pingIp,
+                isEthernetTunnel,
+                isIpv4Preferred,
+            )
+        }
+    }
+
+    fun toTunnelConfig(tunnelConf: TunnelConf): TunnelConfig {
+        return with(tunnelConf) {
+            TunnelConfig(
+                id,
+                tunName,
+                wgQuick,
+                tunnelNetworks.toMutableList(),
+                isMobileDataTunnel,
+                isPrimaryTunnel,
+                amQuick,
+                isActive,
+                isPingEnabled,
+                pingInterval,
+                pingCooldown,
+                pingIp,
+                isEthernetTunnel,
+                isIpv4Preferred,
+            )
+        }
+    }
+}

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

@@ -1,54 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.data.model
-
-import com.zaneschepke.wireguardautotunnel.domain.entity.AppState
-import com.zaneschepke.wireguardautotunnel.ui.theme.Theme
-
-data class GeneralState(
-    val isLocationDisclosureShown: Boolean = LOCATION_DISCLOSURE_SHOWN_DEFAULT,
-    val isBatteryOptimizationDisableShown: Boolean = BATTERY_OPTIMIZATION_DISABLE_SHOWN_DEFAULT,
-    val isPinLockEnabled: Boolean = PIN_LOCK_ENABLED_DEFAULT,
-    val expandedTunnelIds: List<Int> = emptyList(),
-    val isLocalLogsEnabled: Boolean = IS_LOGS_ENABLED_DEFAULT,
-    val isRemoteControlEnabled: Boolean = IS_REMOTE_CONTROL_ENABLED,
-    val remoteKey: String? = null,
-    val locale: String? = null,
-    val theme: Theme = Theme.AUTOMATIC,
-) {
-
-    fun toAppState(): AppState =
-        AppState(
-            isLocationDisclosureShown,
-            isBatteryOptimizationDisableShown,
-            isPinLockEnabled,
-            expandedTunnelIds,
-            isLocalLogsEnabled,
-            isRemoteControlEnabled,
-            remoteKey,
-            locale,
-            theme,
-        )
-
-    companion object {
-        fun from(appState: AppState): GeneralState {
-            return with(appState) {
-                GeneralState(
-                    isLocationDisclosureShown,
-                    isBatteryOptimizationDisableShown,
-                    isPinLockEnabled,
-                    expandedTunnelIds,
-                    isLocalLogsEnabled,
-                    isRemoteControlEnabled,
-                    remoteKey,
-                    locale,
-                    theme,
-                )
-            }
-        }
-
-        const val LOCATION_DISCLOSURE_SHOWN_DEFAULT = false
-        const val BATTERY_OPTIMIZATION_DISABLE_SHOWN_DEFAULT = false
-        const val PIN_LOCK_ENABLED_DEFAULT = false
-        const val IS_LOGS_ENABLED_DEFAULT = false
-        const val IS_REMOTE_CONTROL_ENABLED = false
-    }
-}

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

@@ -1,24 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.data.model
-
-import com.zaneschepke.wireguardautotunnel.domain.entity.AppUpdate
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
-
-@Serializable
-data class GitHubRelease(
-    @SerialName("tag_name") val tagName: String,
-    val name: String?,
-    val body: String?,
-    val assets: List<Asset>,
-) {
-    fun toAppUpdate(): AppUpdate {
-        val apkAsset = assets.firstOrNull { it.name.endsWith(".apk") }
-        return AppUpdate(
-            version = tagName.removePrefix("v"),
-            title = name ?: "Update $tagName",
-            releaseNotes = body ?: "No release notes provided",
-            apkUrl = apkAsset?.browserDownloadUrl,
-            apkFileName = apkAsset?.name,
-        )
-    }
-}

app/src/main/java/com/zaneschepke/wireguardautotunnel/data/network/GitHubApi.kt

@@ -1,7 +1,9 @@
 package com.zaneschepke.wireguardautotunnel.data.network
 
-import com.zaneschepke.wireguardautotunnel.data.model.GitHubRelease
+import com.zaneschepke.wireguardautotunnel.data.entity.GitHubRelease
 
 interface GitHubApi {
     suspend fun getLatestRelease(owner: String, repo: String): Result<GitHubRelease>
+
+    suspend fun getNightlyRelease(owner: String, repo: String): Result<GitHubRelease>
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/data/network/KtorGitHubApi.kt

@@ -1,6 +1,6 @@
 package com.zaneschepke.wireguardautotunnel.data.network
 
-import com.zaneschepke.wireguardautotunnel.data.model.GitHubRelease
+import com.zaneschepke.wireguardautotunnel.data.entity.GitHubRelease
 import io.ktor.client.HttpClient
 import io.ktor.client.call.body
 import io.ktor.client.plugins.ClientRequestException
@@ -24,4 +24,33 @@ class KtorGitHubApi(private val client: HttpClient) : GitHubApi {
             Result.failure(e)
         }
     }
+
+    override suspend fun getNightlyRelease(owner: String, repo: String): Result<GitHubRelease> {
+        return try {
+            // Fetch all releases
+            val releases: List<GitHubRelease> =
+                client.get("https://api.github.com/repos/$owner/$repo/releases").body()
+
+            // Find the first release with "nightly" in the tag_name (case-insensitive)
+            val nightlyRelease =
+                releases.firstOrNull { release ->
+                    release.tagName.contains("nightly", ignoreCase = true)
+                }
+
+            if (nightlyRelease != null) {
+                Result.success(nightlyRelease)
+            } else {
+                Result.failure(Exception("No release with 'nightly' tag found"))
+            }
+        } catch (e: ClientRequestException) {
+            when (e.response.status) {
+                HttpStatusCode.Forbidden -> Result.failure(Exception("Rate limit exceeded"))
+                HttpStatusCode.NotFound ->
+                    Result.failure(Exception("Repository or release not found"))
+                else -> Result.failure(e)
+            }
+        } catch (e: Exception) {
+            Result.failure(e)
+        }
+    }
 }

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

@@ -1,6 +1,6 @@
 package com.zaneschepke.wireguardautotunnel.data.repository
 
-import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
+import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConf
 import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
 import com.zaneschepke.wireguardautotunnel.domain.repository.AppSettingRepository
 import com.zaneschepke.wireguardautotunnel.domain.repository.AppStateRepository

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

@@ -1,8 +1,9 @@
 package com.zaneschepke.wireguardautotunnel.data.repository
 
 import com.zaneschepke.wireguardautotunnel.data.DataStoreManager
-import com.zaneschepke.wireguardautotunnel.data.model.GeneralState
-import com.zaneschepke.wireguardautotunnel.domain.entity.AppState
+import com.zaneschepke.wireguardautotunnel.data.entity.GeneralState
+import com.zaneschepke.wireguardautotunnel.data.mapper.GeneralStateMapper
+import com.zaneschepke.wireguardautotunnel.domain.model.AppState
 import com.zaneschepke.wireguardautotunnel.domain.repository.AppStateRepository
 import com.zaneschepke.wireguardautotunnel.ui.theme.Theme
 import kotlinx.coroutines.flow.Flow
@@ -153,5 +154,5 @@ class DataStoreAppStateRepository(private val dataStoreManager: DataStoreManager
                     }
                 } ?: GeneralState()
             }
-            .map { it.toAppState() }
+            .map(GeneralStateMapper::toAppState)
 }

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

@@ -1,10 +1,13 @@
 package com.zaneschepke.wireguardautotunnel.data.repository
 
 import android.content.Context
+import com.zaneschepke.wireguardautotunnel.BuildConfig
+import com.zaneschepke.wireguardautotunnel.data.mapper.GitHubReleaseMapper
 import com.zaneschepke.wireguardautotunnel.data.network.GitHubApi
 import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
-import com.zaneschepke.wireguardautotunnel.domain.entity.AppUpdate
+import com.zaneschepke.wireguardautotunnel.domain.model.AppUpdate
 import com.zaneschepke.wireguardautotunnel.domain.repository.UpdateRepository
+import com.zaneschepke.wireguardautotunnel.util.Constants
 import com.zaneschepke.wireguardautotunnel.util.NumberUtils
 import io.ktor.client.HttpClient
 import io.ktor.client.request.get
@@ -16,6 +19,7 @@ import io.ktor.utils.io.readAvailable
 import java.io.File
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.withContext
+import timber.log.Timber
 
 class GitHubUpdateRepository(
     private val gitHubApi: GitHubApi,
@@ -27,12 +31,31 @@ class GitHubUpdateRepository(
 ) : UpdateRepository {
     override suspend fun checkForUpdate(currentVersion: String): Result<AppUpdate?> =
         withContext(ioDispatcher) {
-            gitHubApi.getLatestRelease(githubOwner, githubRepo).map { release ->
-                if (
-                    NumberUtils.compareVersions(release.tagName.removePrefix("v"), currentVersion) >
-                        0
-                ) {
-                    release.toAppUpdate()
+            Timber.i("Checking for update")
+            val isNightly = BuildConfig.VERSION_NAME.contains("nightly")
+            val release =
+                if (isNightly) {
+                    gitHubApi.getNightlyRelease(githubOwner, githubRepo).onFailure(Timber::e)
+                } else {
+                    gitHubApi.getLatestRelease(githubOwner, githubRepo).onFailure(Timber::e)
+                }
+            release.map { release ->
+                val apkAsset =
+                    release.assets.find { asset ->
+                        asset.name.startsWith("wgtunnel-${Constants.STANDALONE_FLAVOR}-v") &&
+                            asset.name.endsWith(".apk")
+                    }
+                val newVersion =
+                    apkAsset
+                        ?.name
+                        ?.removePrefix("wgtunnel-${Constants.STANDALONE_FLAVOR}-v")
+                        ?.removeSuffix(".apk") ?: return@map null
+
+                Timber.i("Latest version: $newVersion, current version: $currentVersion")
+                if (isNightly && newVersion != currentVersion)
+                    return@map GitHubReleaseMapper.toAppUpdate(release, newVersion)
+                if (NumberUtils.compareVersions(newVersion, currentVersion) > 0) {
+                    GitHubReleaseMapper.toAppUpdate(release, newVersion)
                 } else {
                     null
                 }

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

@@ -1,9 +1,10 @@
 package com.zaneschepke.wireguardautotunnel.data.repository
 
 import com.zaneschepke.wireguardautotunnel.data.dao.SettingsDao
-import com.zaneschepke.wireguardautotunnel.data.model.Settings
+import com.zaneschepke.wireguardautotunnel.data.entity.Settings
+import com.zaneschepke.wireguardautotunnel.data.mapper.SettingsMapper
 import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
-import com.zaneschepke.wireguardautotunnel.domain.entity.AppSettings
+import com.zaneschepke.wireguardautotunnel.domain.model.AppSettings
 import com.zaneschepke.wireguardautotunnel.domain.repository.AppSettingRepository
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.flow.flowOn
@@ -16,15 +17,15 @@ class RoomSettingsRepository(
 ) : AppSettingRepository {
 
     override suspend fun save(appSettings: AppSettings) {
-        withContext(ioDispatcher) { settingsDoa.save(Settings.from(appSettings)) }
+        withContext(ioDispatcher) { settingsDoa.save(SettingsMapper.toSettings(appSettings)) }
     }
 
     override val flow =
-        settingsDoa.getSettingsFlow().flowOn(ioDispatcher).map { it.toAppSettings() }
+        settingsDoa.getSettingsFlow().flowOn(ioDispatcher).map(SettingsMapper::toAppSettings)
 
     override suspend fun get(): AppSettings {
         return withContext(ioDispatcher) {
-            (settingsDoa.getAll().firstOrNull() ?: Settings()).toAppSettings()
+            SettingsMapper.toAppSettings(settingsDoa.getAll().firstOrNull() ?: Settings())
         }
     }
 }

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

@@ -1,9 +1,9 @@
 package com.zaneschepke.wireguardautotunnel.data.repository
 
 import com.zaneschepke.wireguardautotunnel.data.dao.TunnelConfigDao
-import com.zaneschepke.wireguardautotunnel.data.model.TunnelConfig
+import com.zaneschepke.wireguardautotunnel.data.mapper.TunnelConfigMapper
 import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
-import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
+import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConf
 import com.zaneschepke.wireguardautotunnel.domain.repository.TunnelRepository
 import com.zaneschepke.wireguardautotunnel.util.extensions.Tunnels
 import kotlinx.coroutines.CoroutineDispatcher
@@ -17,19 +17,25 @@ class RoomTunnelRepository(
 ) : TunnelRepository {
 
     override val flow =
-        tunnelConfigDao.getAllFlow().flowOn(ioDispatcher).map { it.map { it.toTunnel() } }
+        tunnelConfigDao.getAllFlow().flowOn(ioDispatcher).map {
+            it.map(TunnelConfigMapper::toTunnelConf)
+        }
 
     override suspend fun getAll(): Tunnels {
-        return withContext(ioDispatcher) { tunnelConfigDao.getAll().map { it.toTunnel() } }
+        return withContext(ioDispatcher) {
+            tunnelConfigDao.getAll().map(TunnelConfigMapper::toTunnelConf)
+        }
     }
 
     override suspend fun save(tunnelConf: TunnelConf) {
-        withContext(ioDispatcher) { tunnelConfigDao.save(TunnelConfig.from(tunnelConf)) }
+        withContext(ioDispatcher) {
+            tunnelConfigDao.save(TunnelConfigMapper.toTunnelConfig(tunnelConf))
+        }
     }
 
     override suspend fun saveAll(tunnelConfList: List<TunnelConf>) {
         withContext(ioDispatcher) {
-            tunnelConfigDao.saveAll(tunnelConfList.map(TunnelConfig::from))
+            tunnelConfigDao.saveAll(tunnelConfList.map(TunnelConfigMapper::toTunnelConfig))
         }
     }
 
@@ -55,15 +61,21 @@ class RoomTunnelRepository(
     }
 
     override suspend fun delete(tunnelConf: TunnelConf) {
-        withContext(ioDispatcher) { tunnelConfigDao.delete(TunnelConfig.from(tunnelConf)) }
+        withContext(ioDispatcher) {
+            tunnelConfigDao.delete(TunnelConfigMapper.toTunnelConfig(tunnelConf))
+        }
     }
 
     override suspend fun getById(id: Int): TunnelConf? {
-        return withContext(ioDispatcher) { tunnelConfigDao.getById(id.toLong())?.toTunnel() }
+        return withContext(ioDispatcher) {
+            tunnelConfigDao.getById(id.toLong())?.let(TunnelConfigMapper::toTunnelConf)
+        }
     }
 
     override suspend fun getActive(): Tunnels {
-        return withContext(ioDispatcher) { tunnelConfigDao.getActive().map { it.toTunnel() } }
+        return withContext(ioDispatcher) {
+            tunnelConfigDao.getActive().map(TunnelConfigMapper::toTunnelConf)
+        }
     }
 
     override suspend fun count(): Int {
@@ -71,22 +83,26 @@ class RoomTunnelRepository(
     }
 
     override suspend fun findByTunnelName(name: String): TunnelConf? {
-        return withContext(ioDispatcher) { tunnelConfigDao.getByName(name)?.toTunnel() }
+        return withContext(ioDispatcher) {
+            tunnelConfigDao.getByName(name)?.let(TunnelConfigMapper::toTunnelConf)
+        }
     }
 
     override suspend fun findByTunnelNetworksName(name: String): Tunnels {
         return withContext(ioDispatcher) {
-            tunnelConfigDao.findByTunnelNetworkName(name).map { it.toTunnel() }
+            tunnelConfigDao.findByTunnelNetworkName(name).map(TunnelConfigMapper::toTunnelConf)
         }
     }
 
     override suspend fun findByMobileDataTunnel(): Tunnels {
         return withContext(ioDispatcher) {
-            tunnelConfigDao.findByMobileDataTunnel().map { it.toTunnel() }
+            tunnelConfigDao.findByMobileDataTunnel().map(TunnelConfigMapper::toTunnelConf)
         }
     }
 
     override suspend fun findPrimary(): Tunnels {
-        return withContext(ioDispatcher) { tunnelConfigDao.findByPrimary().map { it.toTunnel() } }
+        return withContext(ioDispatcher) {
+            tunnelConfigDao.findByPrimary().map(TunnelConfigMapper::toTunnelConf)
+        }
     }
 }

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

@@ -21,7 +21,9 @@ import dagger.hilt.components.SingletonComponent
 import javax.inject.Singleton
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.distinctUntilChangedBy
+import kotlinx.coroutines.flow.map
 import org.amnezia.awg.backend.Backend
 import org.amnezia.awg.backend.GoBackend
 import org.amnezia.awg.backend.RootTunnelActionHandler
@@ -112,10 +114,23 @@ class TunnelModule {
     fun provideNetworkMonitor(
         @ApplicationContext context: Context,
         settingsRepository: AppSettingRepository,
+        @ApplicationScope applicationScope: CoroutineScope,
+        @AppShell appShell: RootShell,
     ): NetworkMonitor {
-        return AndroidNetworkMonitor(context) {
-            runBlocking { settingsRepository.get().isWifiNameByShellEnabled }
-        }
+        return AndroidNetworkMonitor(
+            context,
+            object : AndroidNetworkMonitor.ConfigurationListener {
+                override val detectionMethod: Flow<AndroidNetworkMonitor.WifiDetectionMethod>
+                    get() =
+                        settingsRepository.flow
+                            .distinctUntilChangedBy { it.wifiDetectionMethod }
+                            .map { it.wifiDetectionMethod }
+
+                override val rootShell: RootShell
+                    get() = appShell
+            },
+            applicationScope,
+        )
     }
 
     @Singleton

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

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

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

@@ -1,7 +1,6 @@
 package com.zaneschepke.wireguardautotunnel.domain.enums
 
 sealed class TunnelStatus {
-    data class Error(val error: BackendError) : TunnelStatus()
 
     data object Up : TunnelStatus()
 

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

@@ -1,6 +1,6 @@
 package com.zaneschepke.wireguardautotunnel.domain.events
 
-import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
+import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConf
 
 sealed class AutoTunnelEvent {
     data class Start(val tunnelConf: TunnelConf? = null) : AutoTunnelEvent()

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

@@ -1,4 +1,6 @@
-package com.zaneschepke.wireguardautotunnel.domain.entity
+package com.zaneschepke.wireguardautotunnel.domain.model
+
+import com.zaneschepke.networkmonitor.AndroidNetworkMonitor
 
 data class AppSettings(
     val id: Int = 0,
@@ -15,15 +17,30 @@ data class AppSettings(
     val isPingEnabled: Boolean = false,
     val isAmneziaEnabled: Boolean = false,
     val isWildcardsEnabled: Boolean = false,
-    val isWifiNameByShellEnabled: Boolean = false,
     val isStopOnNoInternetEnabled: Boolean = false,
     val isVpnKillSwitchEnabled: Boolean = false,
     val isKernelKillSwitchEnabled: Boolean = false,
     val isLanOnKillSwitchEnabled: Boolean = false,
     val debounceDelaySeconds: Int = 3,
     val isDisableKillSwitchOnTrustedEnabled: Boolean = false,
+    val isTunnelOnUnsecureEnabled: Boolean = false,
+    val splitTunnelApps: List<String> = emptyList(),
+    val wifiDetectionMethod: AndroidNetworkMonitor.WifiDetectionMethod =
+        AndroidNetworkMonitor.WifiDetectionMethod.DEFAULT,
 ) {
     fun debounceDelayMillis(): Long {
         return debounceDelaySeconds * 1000L
     }
+
+    fun toAutoTunnelStateString(): String {
+        return """
+            TunnelOnWifi: $isTunnelOnWifiEnabled
+            TunnelOnMobileData: $isTunnelOnMobileDataEnabled
+            TunnelOnEthernet: $isTunnelOnEthernetEnabled
+            Wildcards: $isWildcardsEnabled
+            StopOnNoInternet: $isStopOnNoInternetEnabled
+            Trusted Networks: $trustedNetworkSSIDs
+        """
+            .trimIndent()
+    }
 }

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

@@ -1,4 +1,4 @@
-package com.zaneschepke.wireguardautotunnel.domain.entity
+package com.zaneschepke.wireguardautotunnel.domain.model
 
 import com.zaneschepke.wireguardautotunnel.ui.theme.Theme
 

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

@@ -1,4 +1,4 @@
-package com.zaneschepke.wireguardautotunnel.domain.entity
+package com.zaneschepke.wireguardautotunnel.domain.model
 
 data class AppUpdate(
     val version: String,

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

@@ -1,4 +1,4 @@
-package com.zaneschepke.wireguardautotunnel.domain.entity
+package com.zaneschepke.wireguardautotunnel.domain.model
 
 import com.wireguard.android.backend.Tunnel
 import com.wireguard.config.Config
@@ -26,7 +26,6 @@ data class TunnelConf(
     val pingIp: String? = null,
     val isEthernetTunnel: Boolean = false,
     val isIpv4Preferred: Boolean = true,
-    val useCache: Boolean = false,
     @Transient private var stateChangeCallback: ((Any) -> Unit)? = null,
 ) : Tunnel, org.amnezia.awg.backend.Tunnel {
 
@@ -60,6 +59,10 @@ data class TunnelConf(
         return result
     }
 
+    fun isStaticallyConfigured(): Boolean {
+        return toAmConfig().peers.all { it.endpoint.get().host.isValidIpv4orIpv6Address() }
+    }
+
     fun copyWithCallback(
         id: Int = this.id,
         tunName: String = this.tunName,
@@ -107,8 +110,6 @@ data class TunnelConf(
 
     override fun isIpv4ResolutionPreferred(): Boolean = isIpv4Preferred
 
-    override fun useCache(): Boolean = useCache
-
     override fun onStateChange(newState: org.amnezia.awg.backend.Tunnel.State) {
         stateChangeCallback?.invoke(newState)
     }

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

@@ -1,6 +1,6 @@
 package com.zaneschepke.wireguardautotunnel.domain.repository
 
-import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
+import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConf
 
 interface AppDataRepository {
     suspend fun getPrimaryOrFirstTunnel(): TunnelConf?

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

@@ -1,6 +1,6 @@
 package com.zaneschepke.wireguardautotunnel.domain.repository
 
-import com.zaneschepke.wireguardautotunnel.domain.entity.AppSettings
+import com.zaneschepke.wireguardautotunnel.domain.model.AppSettings
 import kotlinx.coroutines.flow.Flow
 
 interface AppSettingRepository {

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

@@ -1,6 +1,6 @@
 package com.zaneschepke.wireguardautotunnel.domain.repository
 
-import com.zaneschepke.wireguardautotunnel.domain.entity.AppState
+import com.zaneschepke.wireguardautotunnel.domain.model.AppState
 import com.zaneschepke.wireguardautotunnel.ui.theme.Theme
 import kotlinx.coroutines.flow.Flow
 

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

@@ -1,6 +1,6 @@
 package com.zaneschepke.wireguardautotunnel.domain.repository
 
-import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
+import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConf
 import com.zaneschepke.wireguardautotunnel.util.extensions.Tunnels
 import kotlinx.coroutines.flow.Flow
 

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

@@ -1,6 +1,6 @@
 package com.zaneschepke.wireguardautotunnel.domain.repository
 
-import com.zaneschepke.wireguardautotunnel.domain.entity.AppUpdate
+import com.zaneschepke.wireguardautotunnel.domain.model.AppUpdate
 import java.io.File
 
 interface UpdateRepository {

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

@@ -12,6 +12,7 @@ class AmneziaStatistics(private val statistics: Statistics) : TunnelStatistics()
                 rxBytes = stats.rxBytes,
                 txBytes = stats.txBytes,
                 latestHandshakeEpochMillis = stats.latestHandshakeEpochMillis,
+                resolvedEndpoint = stats.resolvedEndpoint,
             )
         }
     }

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

@@ -3,10 +3,10 @@ package com.zaneschepke.wireguardautotunnel.domain.state
 import com.zaneschepke.wireguardautotunnel.core.tunnel.allDown
 import com.zaneschepke.wireguardautotunnel.core.tunnel.hasActive
 import com.zaneschepke.wireguardautotunnel.core.tunnel.isUp
-import com.zaneschepke.wireguardautotunnel.domain.entity.AppSettings
-import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
 import com.zaneschepke.wireguardautotunnel.domain.events.AutoTunnelEvent
 import com.zaneschepke.wireguardautotunnel.domain.events.KillSwitchEvent
+import com.zaneschepke.wireguardautotunnel.domain.model.AppSettings
+import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConf
 import com.zaneschepke.wireguardautotunnel.util.extensions.isMatchingToWildcardList
 
 data class AutoTunnelState(
@@ -16,6 +16,7 @@ data class AutoTunnelState(
     val tunnels: List<TunnelConf> = emptyList(),
 ) {
 
+    // also need to check for Wi-Fi state as there is some overlap when they are both connected
     private fun isMobileDataActive(): Boolean {
         return !networkState.isEthernetConnected &&
             !networkState.isWifiConnected &&
@@ -50,6 +51,7 @@ data class AutoTunnelState(
         return getTunnelWithMatchingTunnelNetwork() ?: tunnels.firstOrNull { it.isPrimaryTunnel }
     }
 
+    // ignore cellular state as there is overlap where it may still be active, but not prioritized
     private fun isWifiActive(): Boolean {
         return !networkState.isEthernetConnected && networkState.isWifiConnected
     }

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

@@ -8,6 +8,7 @@ abstract class TunnelStatistics {
         val rxBytes: Long,
         val txBytes: Long,
         val latestHandshakeEpochMillis: Long,
+        val resolvedEndpoint: String,
     )
 
     abstract fun peerStats(peer: Key): PeerStats?

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

@@ -12,6 +12,7 @@ class WireGuardStatistics(private val statistics: Statistics) : TunnelStatistics
                 txBytes = peerStats.txBytes,
                 rxBytes = peerStats.rxBytes,
                 latestHandshakeEpochMillis = peerStats.latestHandshakeEpochMillis,
+                resolvedEndpoint = peerStats.resolvedEndpoint,
             )
         }
     }

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

@@ -13,6 +13,8 @@ sealed class Route {
 
     @Serializable data object AutoTunnelAdvanced : Route()
 
+    @Serializable data object WifiDetectionMethod : Route()
+
     @Serializable data object LocationDisclosure : Route()
 
     @Serializable data object Appearance : Route()
@@ -29,8 +31,6 @@ sealed class Route {
 
     @Serializable data object Lock : Route()
 
-    @Serializable data object Scanner : Route()
-
     @Serializable data object License : Route()
 
     @Serializable data class Config(val id: Int) : Route()

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

@@ -2,22 +2,21 @@ package com.zaneschepke.wireguardautotunnel.ui.common
 
 import androidx.compose.animation.animateContentSize
 import androidx.compose.foundation.ExperimentalFoundationApi
+import androidx.compose.foundation.background
 import androidx.compose.foundation.combinedClickable
 import androidx.compose.foundation.indication
 import androidx.compose.foundation.interaction.MutableInteractionSource
-import androidx.compose.foundation.interaction.PressInteraction
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.material3.ripple
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
 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.geometry.Offset
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.hapticfeedback.HapticFeedbackType
 import androidx.compose.ui.platform.LocalHapticFeedback
 import androidx.compose.ui.text.style.TextOverflow
@@ -44,32 +43,25 @@ fun ExpandingRowListItem(
         modifier =
             Modifier.animateContentSize()
                 .clip(RoundedCornerShape(8.dp))
+                .background(
+                    if (isSelected) MaterialTheme.colorScheme.primary.copy(alpha = 0.1f)
+                    else Color.Transparent
+                )
                 .then(
                     if (!isTv) {
                         Modifier.combinedClickable(
-                                onClick = onClick,
-                                onLongClick = {
-                                    haptic.performHapticFeedback(HapticFeedbackType.LongPress)
-                                    onHold()
-                                },
-                                onDoubleClick = onDoubleClick,
-                            )
-                            .indication(
-                                interactionSource = interactionSource,
-                                indication = ripple(),
-                            )
+                            interactionSource = interactionSource,
+                            indication = ripple(),
+                            onClick = onClick,
+                            onLongClick = {
+                                haptic.performHapticFeedback(HapticFeedbackType.LongPress)
+                                onHold()
+                            },
+                            onDoubleClick = onDoubleClick,
+                        )
                     } else Modifier
                 )
     ) {
-        LaunchedEffect(isSelected) {
-            if (isSelected) {
-                interactionSource.emit(PressInteraction.Press(Offset.Zero))
-            } else {
-                interactionSource.emit(
-                    PressInteraction.Release(PressInteraction.Press(Offset.Zero))
-                )
-            }
-        }
         Column {
             Row(
                 modifier = Modifier.fillMaxWidth().padding(horizontal = 12.dp),

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

@@ -73,7 +73,7 @@ fun IconSurfaceButton(
                                 else MaterialTheme.colorScheme.onSurface,
                             )
                         }
-                        Column {
+                        Column(verticalArrangement = Arrangement.spacedBy(4.dp)) {
                             Text(title, style = MaterialTheme.typography.titleMedium)
                             description?.let {
                                 Text(

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

@@ -0,0 +1,42 @@
+package com.zaneschepke.wireguardautotunnel.ui.common.functions
+
+import android.content.ClipData
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.ui.platform.ClipEntry
+import androidx.compose.ui.platform.Clipboard
+import androidx.compose.ui.platform.LocalClipboard
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+
+class ClipboardHelper(
+    private val clipboard: Clipboard,
+    private val coroutineScope: CoroutineScope,
+    private val dispatcher: CoroutineDispatcher = Dispatchers.Main,
+) {
+    fun copy(text: String, label: String = "") {
+        coroutineScope.launch(dispatcher) {
+            val clipData = ClipData.newPlainText(label, text)
+            clipboard.setClipEntry(ClipEntry(clipData))
+        }
+    }
+
+    fun paste(onResult: (String?) -> Unit) {
+        coroutineScope.launch(dispatcher) {
+            val entry = clipboard.getClipEntry()
+            val text = entry?.clipData?.getItemAt(0)?.text?.toString()
+            onResult(text)
+        }
+    }
+}
+
+@Composable
+fun rememberClipboardHelper(
+    coroutineScope: CoroutineScope = rememberCoroutineScope()
+): ClipboardHelper {
+    val clipboard = LocalClipboard.current
+    return remember(clipboard, coroutineScope) { ClipboardHelper(clipboard, coroutineScope) }
+}

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/navigation/components/currentNavBackStackEntryAsNavBarState.kt

@@ -4,16 +4,7 @@ import android.os.Build
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.size
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.rounded.Add
-import androidx.compose.material.icons.rounded.CopyAll
-import androidx.compose.material.icons.rounded.Delete
-import androidx.compose.material.icons.rounded.Download
-import androidx.compose.material.icons.rounded.Edit
-import androidx.compose.material.icons.rounded.Menu
-import androidx.compose.material.icons.rounded.PlayArrow
-import androidx.compose.material.icons.rounded.Save
-import androidx.compose.material.icons.rounded.SelectAll
-import androidx.compose.material.icons.rounded.Stop
+import androidx.compose.material.icons.rounded.*
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.Text
@@ -197,6 +188,14 @@ fun currentNavBackStackEntryAsNavBarState(
                         route = Route.Display,
                     )
 
+                backStackEntry.isCurrentRoute(Route.WifiDetectionMethod::class) ->
+                    NavBarState(
+                        showTop = true,
+                        showBottom = true,
+                        topTitle = { Text(stringResource(R.string.wifi_detection_method)) },
+                        route = Route.WifiDetectionMethod,
+                    )
+
                 backStackEntry.isCurrentRoute(Route.KillSwitch::class) ->
                     NavBarState(
                         showTop = true,
@@ -240,8 +239,17 @@ fun currentNavBackStackEntryAsNavBarState(
                         showBottom = true,
                         topTitle = { tunnel?.name?.let { Text(it) } },
                         topTrailing = {
-                            ActionIconButton(Icons.Rounded.Edit, R.string.edit_tunnel) {
-                                tunnel?.id?.let { navController.navigate(Route.Config(it)) }
+                            Row {
+                                ActionIconButton(Icons.Rounded.QrCode2, R.string.show_qr) {
+                                    tunnel?.id?.let {
+                                        viewModel.handleEvent(
+                                            AppEvent.SetShowModal(AppViewState.ModalType.QR)
+                                        )
+                                    }
+                                }
+                                ActionIconButton(Icons.Rounded.Edit, R.string.edit_tunnel) {
+                                    tunnel?.id?.let { navController.navigate(Route.Config(it)) }
+                                }
                             }
                         },
                         route = args?.let { Route.TunnelOptions(it.id) },

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

@@ -1,7 +1,7 @@
 package com.zaneschepke.wireguardautotunnel.ui.screens.autotunnel.components
 
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.outlined.AirplanemodeActive
+import androidx.compose.material.icons.outlined.PublicOff
 import androidx.compose.material.icons.outlined.SettingsEthernet
 import androidx.compose.material.icons.outlined.SignalCellular4Bar
 import androidx.compose.material3.MaterialTheme
@@ -95,7 +95,7 @@ fun NetworkTunnelingItems(uiState: AppUiState, viewModel: AppViewModel): List<Se
             onClick = { viewModel.handleEvent(AppEvent.ToggleAutoTunnelOnEthernet) },
         ),
         SelectionItem(
-            leadingIcon = Icons.Outlined.AirplanemodeActive,
+            leadingIcon = Icons.Outlined.PublicOff,
             title = {
                 Text(
                     stringResource(R.string.stop_on_no_internet),

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

@@ -1,18 +1,9 @@
 package com.zaneschepke.wireguardautotunnel.ui.screens.autotunnel.components
 
 import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.*
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.outlined.Code
-import androidx.compose.material.icons.outlined.Filter1
-import androidx.compose.material.icons.outlined.Security
-import androidx.compose.material.icons.outlined.VpnKeyOff
-import androidx.compose.material.icons.outlined.Wifi
+import androidx.compose.material.icons.outlined.*
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
@@ -22,19 +13,23 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalClipboardManager
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
+import com.zaneschepke.networkmonitor.AndroidNetworkMonitor
 import com.zaneschepke.networkmonitor.NetworkStatus
 import com.zaneschepke.wireguardautotunnel.R
+import com.zaneschepke.wireguardautotunnel.ui.Route
+import com.zaneschepke.wireguardautotunnel.ui.common.button.ForwardButton
 import com.zaneschepke.wireguardautotunnel.ui.common.button.ScaledSwitch
 import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SelectionItem
+import com.zaneschepke.wireguardautotunnel.ui.common.functions.rememberClipboardHelper
+import com.zaneschepke.wireguardautotunnel.ui.navigation.LocalNavController
 import com.zaneschepke.wireguardautotunnel.ui.screens.settings.components.LearnMoreLinkLabel
 import com.zaneschepke.wireguardautotunnel.ui.state.AppUiState
 import com.zaneschepke.wireguardautotunnel.ui.theme.iconSize
+import com.zaneschepke.wireguardautotunnel.util.extensions.asString
 import com.zaneschepke.wireguardautotunnel.util.extensions.openWebUrl
 import com.zaneschepke.wireguardautotunnel.viewmodel.AppViewModel
 import com.zaneschepke.wireguardautotunnel.viewmodel.event.AppEvent
@@ -48,7 +43,8 @@ fun WifiTunnelingItems(
     isWifiNameReadable: () -> Boolean,
 ): List<SelectionItem> {
     val context = LocalContext.current
-    val clipboard = LocalClipboardManager.current
+    val navController = LocalNavController.current
+    val clipboardHelper = rememberClipboardHelper()
 
     val baseItems =
         listOf(
@@ -71,65 +67,77 @@ fun WifiTunnelingItems(
                     )
                 },
                 description = {
-                    val wifiName by
+                    val wifiInfo by
                         remember(uiState.networkStatus) {
                             derivedStateOf {
                                 (uiState.networkStatus as? NetworkStatus.Connected)
                                     ?.takeIf { it.wifiConnected }
-                                    ?.wifiSsid
+                                    .let { Pair(it?.wifiSsid, it?.securityType) }
                             }
                         }
-                    Text(
-                        text =
-                            wifiName?.let { stringResource(R.string.wifi_name_template, it) }
-                                ?: stringResource(R.string.inactive),
-                        style =
-                            MaterialTheme.typography.bodySmall.copy(
-                                color = MaterialTheme.colorScheme.outline
-                            ),
-                        maxLines = 1,
-                        overflow = TextOverflow.Ellipsis,
-                        modifier =
-                            Modifier.clickable {
-                                wifiName?.let { clipboard.setText(AnnotatedString(it)) }
-                            },
-                    )
+                    val (wifiName, securityType) = wifiInfo
+                    Column {
+                        Text(
+                            text =
+                                wifiName?.let { stringResource(R.string.wifi_name_template, it) }
+                                    ?: stringResource(R.string.inactive),
+                            style =
+                                MaterialTheme.typography.bodySmall.copy(
+                                    color = MaterialTheme.colorScheme.outline
+                                ),
+                            maxLines = 1,
+                            overflow = TextOverflow.Ellipsis,
+                            modifier =
+                                Modifier.clickable { wifiName?.let { clipboardHelper.copy(it) } },
+                        )
+                        securityType?.let {
+                            Text(
+                                text = stringResource(R.string.security_template, it.name),
+                                style =
+                                    MaterialTheme.typography.bodySmall.copy(
+                                        color = MaterialTheme.colorScheme.outline
+                                    ),
+                                maxLines = 1,
+                                overflow = TextOverflow.Ellipsis,
+                            )
+                        }
+                    }
                 },
                 onClick = { viewModel.handleEvent(AppEvent.ToggleAutoTunnelOnWifi) },
-            ),
-            SelectionItem(
-                leadingIcon = Icons.Outlined.Code,
-                title = {
-                    Text(
-                        stringResource(R.string.wifi_name_via_shell),
-                        style =
-                            MaterialTheme.typography.bodyMedium.copy(
-                                MaterialTheme.colorScheme.onSurface
-                            ),
-                    )
-                },
-                description = {
-                    Text(
-                        stringResource(R.string.use_root_shell_for_wifi),
-                        style =
-                            MaterialTheme.typography.bodySmall.copy(
-                                MaterialTheme.colorScheme.outline
-                            ),
-                    )
-                },
-                trailing = {
-                    ScaledSwitch(
-                        checked = uiState.appSettings.isWifiNameByShellEnabled,
-                        onClick = { viewModel.handleEvent(AppEvent.ToggleRootShellWifi) },
-                    )
-                },
-                onClick = { viewModel.handleEvent(AppEvent.ToggleRootShellWifi) },
-            ),
+            )
         )
 
     return if (uiState.appSettings.isTunnelOnWifiEnabled) {
         baseItems +
             listOf(
+                SelectionItem(
+                    leadingIcon = Icons.Outlined.WifiFind,
+                    title = {
+                        Text(
+                            stringResource(R.string.wifi_detection_method),
+                            style =
+                                MaterialTheme.typography.bodyMedium.copy(
+                                    MaterialTheme.colorScheme.onSurface
+                                ),
+                        )
+                    },
+                    description = {
+                        Text(
+                            stringResource(
+                                R.string.current_template,
+                                uiState.appSettings.wifiDetectionMethod.asString(context),
+                            ),
+                            style =
+                                MaterialTheme.typography.bodySmall.copy(
+                                    MaterialTheme.colorScheme.outline
+                                ),
+                        )
+                    },
+                    trailing = {
+                        ForwardButton { navController.navigate(Route.WifiDetectionMethod) }
+                    },
+                    onClick = { navController.navigate(Route.WifiDetectionMethod) },
+                ),
                 SelectionItem(
                     leadingIcon = Icons.Outlined.Filter1,
                     title = {
@@ -194,7 +202,10 @@ fun WifiTunnelingItems(
                             currentText = currentText,
                             onSave = { ssid ->
                                 if (
-                                    uiState.appSettings.isWifiNameByShellEnabled ||
+                                    uiState.appSettings.wifiDetectionMethod ==
+                                        AndroidNetworkMonitor.WifiDetectionMethod.ROOT ||
+                                        uiState.appSettings.wifiDetectionMethod ==
+                                            AndroidNetworkMonitor.WifiDetectionMethod.SHIZUKU ||
                                         isWifiNameReadable()
                                 ) {
                                     viewModel.handleEvent(AppEvent.SaveTrustedSSID(ssid))

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/autotunnel/detection/WifiDetectionMethodScreen.kt

@@ -0,0 +1,39 @@
+package com.zaneschepke.wireguardautotunnel.ui.screens.autotunnel.detection
+
+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.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.unit.dp
+import com.zaneschepke.networkmonitor.AndroidNetworkMonitor
+import com.zaneschepke.wireguardautotunnel.ui.common.button.IconSurfaceButton
+import com.zaneschepke.wireguardautotunnel.ui.state.AppUiState
+import com.zaneschepke.wireguardautotunnel.util.extensions.asDescriptionString
+import com.zaneschepke.wireguardautotunnel.util.extensions.asString
+import com.zaneschepke.wireguardautotunnel.viewmodel.AppViewModel
+import com.zaneschepke.wireguardautotunnel.viewmodel.event.AppEvent
+
+@Composable
+fun WifiDetectionMethodScreen(uiState: AppUiState, viewModel: AppViewModel) {
+    val context = LocalContext.current
+    Column(
+        horizontalAlignment = Alignment.Start,
+        verticalArrangement = Arrangement.spacedBy(24.dp, Alignment.Top),
+        modifier = Modifier.fillMaxSize().padding(top = 24.dp).padding(horizontal = 24.dp),
+    ) {
+        enumValues<AndroidNetworkMonitor.WifiDetectionMethod>().forEach {
+            val title = it.asString(context)
+            val description = it.asDescriptionString(context)
+            IconSurfaceButton(
+                title = title,
+                onClick = { viewModel.handleEvent(AppEvent.SetDetectionMethod(it)) },
+                selected = uiState.appSettings.wifiDetectionMethod == it,
+                description = description,
+            )
+        }
+    }
+}

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

@@ -7,12 +7,14 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.Text
 import androidx.compose.runtime.*
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalClipboardManager
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
+import com.journeyapps.barcodescanner.ScanContract
+import com.journeyapps.barcodescanner.ScanOptions
 import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.ui.Route
 import com.zaneschepke.wireguardautotunnel.ui.common.dialog.InfoDialog
+import com.zaneschepke.wireguardautotunnel.ui.common.functions.rememberClipboardHelper
 import com.zaneschepke.wireguardautotunnel.ui.common.functions.rememberFileImportLauncherForResult
 import com.zaneschepke.wireguardautotunnel.ui.navigation.LocalNavController
 import com.zaneschepke.wireguardautotunnel.ui.screens.main.components.ExportTunnelsBottomSheet
@@ -29,7 +31,7 @@ import com.zaneschepke.wireguardautotunnel.viewmodel.event.AppEvent
 @Composable
 fun MainScreen(appUiState: AppUiState, appViewState: AppViewState, viewModel: AppViewModel) {
     val navController = LocalNavController.current
-    val clipboard = LocalClipboardManager.current
+    val clipboard = rememberClipboardHelper()
 
     var showUrlImportDialog by remember { mutableStateOf(false) }
 
@@ -45,6 +47,15 @@ fun MainScreen(appUiState: AppUiState, appViewState: AppViewState, viewModel: Ap
             onData = { data -> viewModel.handleEvent(AppEvent.ImportTunnelFromFile(data)) },
         )
 
+    val scanLauncher =
+        rememberLauncherForActivityResult(
+            contract = ScanContract(),
+            onResult = { result ->
+                if (result != null && result.contents.isNotEmpty())
+                    viewModel.handleEvent(AppEvent.ImportTunnelFromQrCode(result.contents))
+            },
+        )
+
     val requestPermissionLauncher =
         rememberLauncherForActivityResult(ActivityResultContracts.RequestPermission()) { isGranted
             ->
@@ -56,7 +67,9 @@ fun MainScreen(appUiState: AppUiState, appViewState: AppViewState, viewModel: Ap
                 )
                 return@rememberLauncherForActivityResult
             }
-            navController.navigate(Route.Scanner)
+            scanLauncher.launch(
+                ScanOptions().setDesiredBarcodeFormats(ScanOptions.QR_CODE).setBeepEnabled(false)
+            )
         }
 
     if (appViewState.showModal == AppViewState.ModalType.DELETE) {
@@ -90,8 +103,9 @@ fun MainScreen(appUiState: AppUiState, appViewState: AppViewState, viewModel: Ap
                     requestPermissionLauncher.launch(android.Manifest.permission.CAMERA)
                 },
                 onClipboardClick = {
-                    clipboard.getText()?.text?.let {
-                        viewModel.handleEvent(AppEvent.ImportTunnelFromClipboard(it))
+                    clipboard.paste { result ->
+                        if (result != null)
+                            viewModel.handleEvent(AppEvent.ImportTunnelFromClipboard(result))
                     }
                 },
                 onManualImportClick = {

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

@@ -15,8 +15,8 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
-import com.zaneschepke.wireguardautotunnel.domain.entity.AppSettings
-import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
+import com.zaneschepke.wireguardautotunnel.domain.model.AppSettings
+import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConf
 import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SurfaceSelectionGroupButton
 import com.zaneschepke.wireguardautotunnel.ui.screens.main.autotunnel.components.EthernetTunnelItem
 import com.zaneschepke.wireguardautotunnel.ui.screens.main.autotunnel.components.MobileDataTunnelItem

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

@@ -7,7 +7,7 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
 import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
+import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConf
 import com.zaneschepke.wireguardautotunnel.ui.common.button.ScaledSwitch
 import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SelectionItem
 import com.zaneschepke.wireguardautotunnel.viewmodel.AppViewModel

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

@@ -7,7 +7,7 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
 import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
+import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConf
 import com.zaneschepke.wireguardautotunnel.ui.common.button.ScaledSwitch
 import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SelectionItem
 import com.zaneschepke.wireguardautotunnel.viewmodel.AppViewModel

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

@@ -16,8 +16,8 @@ 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.domain.entity.AppSettings
-import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
+import com.zaneschepke.wireguardautotunnel.domain.model.AppSettings
+import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConf
 import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SelectionItem
 import com.zaneschepke.wireguardautotunnel.ui.screens.autotunnel.components.TrustedNetworkTextBox
 import com.zaneschepke.wireguardautotunnel.ui.screens.autotunnel.components.WildcardsLabel

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

@@ -93,7 +93,7 @@ fun ExportTunnelsBottomSheet(viewModel: AppViewModel) {
         ExportOptionRow(
             label = stringResource(R.string.export_tunnels_amnezia),
             onClick = {
-                exportConfigType = ConfigType.AMNEZIA
+                exportConfigType = ConfigType.AM
                 if (!isAuthorized && !isTv) {
                     showAuthPrompt = true
                 } else {

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

@@ -7,6 +7,7 @@ import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.foundation.overscroll
+import androidx.compose.foundation.rememberOverscrollEffect
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
@@ -15,9 +16,10 @@ import androidx.compose.ui.input.pointer.pointerInput
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.unit.dp
 import com.zaneschepke.wireguardautotunnel.core.tunnel.getValueById
-import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
+import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConf
 import com.zaneschepke.wireguardautotunnel.domain.state.TunnelState
 import com.zaneschepke.wireguardautotunnel.ui.Route
+import com.zaneschepke.wireguardautotunnel.ui.navigation.LocalIsAndroidTV
 import com.zaneschepke.wireguardautotunnel.ui.navigation.LocalNavController
 import com.zaneschepke.wireguardautotunnel.ui.state.AppUiState
 import com.zaneschepke.wireguardautotunnel.util.extensions.openWebUrl
@@ -35,12 +37,19 @@ fun TunnelList(
     onToggleTunnel: (TunnelConf, Boolean) -> Unit,
     viewModel: AppViewModel,
 ) {
+    val isTv = LocalIsAndroidTV.current
     val context = LocalContext.current
     val navController = LocalNavController.current
     val collator = Collator.getInstance(Locale.getDefault())
     val sortedTunnels =
         remember(appUiState.tunnels) {
-            appUiState.tunnels.sortedWith(compareBy(collator) { it.tunName })
+            appUiState.tunnels.sortedWith(
+                compareBy(
+                    // primary tunnel first
+                    { !it.isPrimaryTunnel },
+                    { collator.compare(it.tunName, "") },
+                )
+            )
         }
 
     LazyColumn(
@@ -49,7 +58,7 @@ fun TunnelList(
         modifier =
             modifier
                 .pointerInput(Unit) { if (appUiState.tunnels.isEmpty()) return@pointerInput }
-                .overscroll(ScrollableDefaults.overscrollEffect()),
+                .overscroll(rememberOverscrollEffect()),
         state = rememberLazyListState(0, appUiState.tunnels.count()),
         userScrollEnabled = true,
         reverseLayout = false,
@@ -71,8 +80,12 @@ fun TunnelList(
                 tunnel = tunnel,
                 tunnelState = tunnelState,
                 onClick = {
-                    navController.navigate(Route.TunnelOptions(tunnel.id))
-                    viewModel.handleEvent(AppEvent.ClearSelectedTunnels)
+                    if (selectedTunnels.isNotEmpty() && !isTv) {
+                        viewModel.handleEvent(AppEvent.ToggleSelectedTunnel(tunnel))
+                    } else {
+                        navController.navigate(Route.TunnelOptions(tunnel.id))
+                        viewModel.handleEvent(AppEvent.ClearSelectedTunnels)
+                    }
                 },
                 onDoubleClick = {
                     viewModel.handleEvent(AppEvent.ToggleTunnelStatsExpanded(tunnel.id))
@@ -81,6 +94,7 @@ fun TunnelList(
                     viewModel.handleEvent(AppEvent.ToggleSelectedTunnel(it))
                 },
                 onSwitchClick = { checked -> onToggleTunnel(tunnel, checked) },
+                isTv = isTv,
             )
         }
     }

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

@@ -22,11 +22,10 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
+import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConf
 import com.zaneschepke.wireguardautotunnel.domain.state.TunnelState
 import com.zaneschepke.wireguardautotunnel.ui.common.ExpandingRowListItem
 import com.zaneschepke.wireguardautotunnel.ui.common.button.ScaledSwitch
-import com.zaneschepke.wireguardautotunnel.ui.navigation.LocalIsAndroidTV
 import com.zaneschepke.wireguardautotunnel.util.extensions.asColor
 
 @Composable
@@ -40,9 +39,8 @@ fun TunnelRowItem(
     onDoubleClick: () -> Unit,
     onToggleSelectedTunnel: (TunnelConf) -> Unit,
     onSwitchClick: (Boolean) -> Unit,
+    isTv: Boolean,
 ) {
-    val isTv = LocalIsAndroidTV.current
-
     val leadingIconColor =
         remember(state) {
             if (state.status.isUp()) tunnelState.statistics.asColor() else Color.Gray

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

@@ -8,12 +8,15 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.derivedStateOf
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.remember
 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.domain.entity.TunnelConf
+import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConf
 import com.zaneschepke.wireguardautotunnel.domain.state.TunnelStatistics
 import com.zaneschepke.wireguardautotunnel.util.NumberUtils
 import com.zaneschepke.wireguardautotunnel.util.extensions.toThreeDecimalPlaceString
@@ -21,49 +24,90 @@ import com.zaneschepke.wireguardautotunnel.util.extensions.toThreeDecimalPlaceSt
 @Composable
 fun TunnelStatisticsRow(statistics: TunnelStatistics?, tunnelConf: TunnelConf) {
     val config = TunnelConf.configFromAmQuick(tunnelConf.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
-            val peerTxMB = NumberUtils.bytesToMB(peerTx).toThreeDecimalPlaceString()
-            val peerRxMB = NumberUtils.bytesToMB(peerRx).toThreeDecimalPlaceString()
-            val handshake =
-                statistics?.peerStats(peer.publicKey)?.latestHandshakeEpochMillis?.let {
-                    if (it == 0L) {
-                        stringResource(R.string.never)
-                    } else {
-                        "${NumberUtils.getSecondsBetweenTimestampAndNow(it)} ${stringResource(R.string.sec)}"
+    Column(
+        modifier = Modifier.fillMaxWidth().padding(start = 45.dp, bottom = 10.dp, end = 10.dp),
+        verticalArrangement = Arrangement.spacedBy(10.dp, Alignment.CenterVertically),
+        horizontalAlignment = Alignment.Start,
+    ) {
+        config.peers.forEach { peer ->
+            val peerId = remember { peer.publicKey.toBase64().subSequence(0, 3).toString() + "***" }
+            val endpoint =
+                remember(statistics) { statistics?.peerStats(peer.publicKey)?.resolvedEndpoint }
+            val peerRxMB by
+                remember(statistics) {
+                    derivedStateOf {
+                        statistics
+                            ?.peerStats(peer.publicKey)
+                            ?.rxBytes
+                            ?.let { NumberUtils.bytesToMB(it) }
+                            ?.toThreeDecimalPlaceString()
                     }
-                } ?: stringResource(R.string.never)
-            Column(verticalArrangement = Arrangement.spacedBy(10.dp)) {
+                }
+            val peerTxMB by
+                remember(statistics) {
+                    derivedStateOf {
+                        statistics
+                            ?.peerStats(peer.publicKey)
+                            ?.txBytes
+                            ?.let { NumberUtils.bytesToMB(it) }
+                            ?.toThreeDecimalPlaceString()
+                    }
+                }
+            val handshake by
+                remember(statistics) {
+                    derivedStateOf {
+                        statistics?.peerStats(peer.publicKey)?.latestHandshakeEpochMillis?.let {
+                            if (it == 0L) {
+                                null
+                            } else {
+                                "${NumberUtils.getSecondsBetweenTimestampAndNow(it)}"
+                            }
+                        }
+                    }
+                }
+            Row(
+                verticalAlignment = Alignment.CenterVertically,
+                horizontalArrangement = Arrangement.spacedBy(16.dp, Alignment.Start),
+            ) {
                 Text(
                     stringResource(R.string.peer).lowercase() + ": $peerId",
                     style = MaterialTheme.typography.bodySmall,
                     color = MaterialTheme.colorScheme.outline,
                 )
                 Text(
-                    "tx: $peerTxMB MB",
+                    stringResource(R.string.handshake) +
+                        ": ${if(handshake == null) stringResource(R.string.never) else handshake + " " + stringResource(R.string.sec)}",
                     style = MaterialTheme.typography.bodySmall,
                     color = MaterialTheme.colorScheme.outline,
                 )
             }
-            Column(verticalArrangement = Arrangement.spacedBy(10.dp)) {
+            Row(
+                verticalAlignment = Alignment.CenterVertically,
+                horizontalArrangement = Arrangement.spacedBy(16.dp, Alignment.Start),
+            ) {
                 Text(
-                    stringResource(R.string.handshake) + ": $handshake",
+                    "rx: ${peerRxMB ?: 0.00} MB",
                     style = MaterialTheme.typography.bodySmall,
                     color = MaterialTheme.colorScheme.outline,
                 )
                 Text(
-                    "rx: $peerRxMB MB",
+                    "tx: ${peerTxMB ?: 0.00} MB",
                     style = MaterialTheme.typography.bodySmall,
                     color = MaterialTheme.colorScheme.outline,
                 )
             }
+            if (endpoint != null) {
+                Row(
+                    verticalAlignment = Alignment.CenterVertically,
+                    horizontalArrangement = Arrangement.spacedBy(16.dp, Alignment.Start),
+                ) {
+                    Text(
+                        "endpoint: $endpoint",
+                        style = MaterialTheme.typography.bodySmall,
+                        color = MaterialTheme.colorScheme.outline,
+                    )
+                }
+            }
         }
     }
 }

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

@@ -20,7 +20,7 @@ import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.zaneschepke.wireguardautotunnel.MainActivity
 import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
+import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConf
 import com.zaneschepke.wireguardautotunnel.ui.common.prompt.AuthorizationPrompt
 import com.zaneschepke.wireguardautotunnel.ui.screens.main.config.components.AddPeerButton
 import com.zaneschepke.wireguardautotunnel.ui.screens.main.config.components.InterfaceSection

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

@@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
-import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
+import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConf
 import com.zaneschepke.wireguardautotunnel.domain.repository.TunnelRepository
 import com.zaneschepke.wireguardautotunnel.ui.screens.main.config.state.ConfigUiState
 import com.zaneschepke.wireguardautotunnel.ui.state.ConfigProxy

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

@@ -16,16 +16,15 @@ import androidx.compose.material3.OutlinedTextField
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalClipboardManager
 import androidx.compose.ui.platform.LocalSoftwareKeyboardController
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.AnnotatedString
 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 com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.ui.common.config.ConfigurationTextBox
+import com.zaneschepke.wireguardautotunnel.ui.common.functions.rememberClipboardHelper
 import com.zaneschepke.wireguardautotunnel.ui.state.InterfaceProxy
 
 @Composable
@@ -38,7 +37,7 @@ fun InterfaceFields(
     onInterfaceChange: (InterfaceProxy) -> Unit,
 ) {
     val keyboardController = LocalSoftwareKeyboardController.current
-    val clipboardManager = LocalClipboardManager.current
+    val clipboardManager = rememberClipboardHelper()
     val keyboardActions = KeyboardActions(onDone = { keyboardController?.hide() })
     val keyboardOptions = KeyboardOptions(imeAction = ImeAction.Done)
 
@@ -53,8 +52,9 @@ fun InterfaceFields(
             if (isAuthenticated) VisualTransformation.None else PasswordVisualTransformation(),
         trailingIcon = {
             IconButton(
-                enabled = isAuthenticated,
+                enabled = true,
                 onClick = {
+                    if (!isAuthenticated) return@IconButton showAuthPrompt()
                     val keypair = com.wireguard.crypto.KeyPair()
                     onInterfaceChange(
                         interfaceState.copy(
@@ -88,9 +88,7 @@ fun InterfaceFields(
         modifier = Modifier.fillMaxWidth(),
         singleLine = true,
         trailingIcon = {
-            IconButton(
-                onClick = { clipboardManager.setText(AnnotatedString(interfaceState.publicKey)) }
-            ) {
+            IconButton(onClick = { clipboardManager.copy(interfaceState.publicKey) }) {
                 Icon(Icons.Rounded.ContentCopy, stringResource(R.string.copy_public_key))
             }
         },

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

@@ -1,33 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.ui.screens.main.scanner
-
-import android.app.Activity
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.DisposableEffect
-import androidx.compose.runtime.remember
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.viewinterop.AndroidView
-import com.journeyapps.barcodescanner.CompoundBarcodeView
-import com.zaneschepke.wireguardautotunnel.viewmodel.AppViewModel
-import com.zaneschepke.wireguardautotunnel.viewmodel.event.AppEvent
-
-@Composable
-fun ScannerScreen(viewModel: AppViewModel) {
-    val context = LocalContext.current
-
-    val barcodeView = remember {
-        CompoundBarcodeView(context).apply {
-            this.initializeFromIntent((context as Activity).intent)
-            this.setStatusText("")
-            this.decodeSingle { result ->
-                result.text?.let { barCodeOrQr ->
-                    viewModel.handleEvent(AppEvent.ImportTunnelFromQrCode(barCodeOrQr))
-                }
-            }
-        }
-    }
-    AndroidView(factory = { barcodeView })
-    DisposableEffect(Unit) {
-        barcodeView.resume()
-        onDispose { barcodeView.pause() }
-    }
-}

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

@@ -1,12 +1,15 @@
 package com.zaneschepke.wireguardautotunnel.ui.screens.main.splittunnel
 
-import androidx.compose.animation.Crossfade
-import androidx.compose.animation.core.tween
+import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.size
+import androidx.compose.material3.CircularProgressIndicator
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.zaneschepke.wireguardautotunnel.R
@@ -34,21 +37,16 @@ fun SplitTunnelScreen(
             appViewModel.handleEvent(AppEvent.PopBackStack(true))
         }
     }
-
-    Crossfade(
-        targetState = uiState.loading,
-        animationSpec = tween(200),
-        modifier = Modifier.fillMaxSize(),
-    ) { isLoading ->
-        if (isLoading) {
-            SplitTunnelSkeleton()
-        } else {
-            SplitTunnelContent(
-                uiState = uiState,
-                onSplitOptionChange = viewModel::updateSplitOption,
-                onAppSelectionToggle = viewModel::toggleAppSelection,
-                onQueryChange = viewModel::onSearchQuery,
-            )
+    if (uiState.loading) {
+        Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
+            CircularProgressIndicator(modifier = Modifier.size(30.dp), strokeWidth = 5.dp)
         }
+    } else {
+        SplitTunnelContent(
+            uiState = uiState,
+            onSplitOptionChange = viewModel::updateSplitOption,
+            onAppSelectionToggle = viewModel::toggleAppSelection,
+            onQueryChange = viewModel::onSearchQuery,
+        )
     }
 }

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

@@ -1,92 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.ui.screens.main.splittunnel
-
-import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.PaddingValues
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.width
-import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
-import androidx.compose.ui.unit.dp
-import com.zaneschepke.wireguardautotunnel.ui.common.animation.ShimmerEffect
-import com.zaneschepke.wireguardautotunnel.ui.theme.iconSize
-
-@Composable
-fun SplitTunnelSkeleton() {
-    val shimmerBrush = ShimmerEffect()
-
-    Column(
-        verticalArrangement = Arrangement.spacedBy(24.dp, Alignment.CenterVertically),
-        horizontalAlignment = Alignment.CenterHorizontally,
-        modifier = Modifier.fillMaxWidth().padding(top = 24.dp),
-    ) {
-        Row(
-            modifier = Modifier.fillMaxWidth().padding(horizontal = 24.dp).height(45.dp),
-            horizontalArrangement = Arrangement.spacedBy(8.dp),
-        ) {
-            repeat(3) {
-                Box(
-                    modifier =
-                        Modifier.weight(1f)
-                            .height(45.dp)
-                            .clip(RoundedCornerShape(8.dp))
-                            .background(shimmerBrush)
-                )
-            }
-        }
-
-        Row(
-            modifier = Modifier.fillMaxWidth().padding(horizontal = 24.dp).height(45.dp),
-            horizontalArrangement = Arrangement.spacedBy(8.dp),
-        ) {
-            Box(
-                modifier =
-                    Modifier.height(45.dp)
-                        .fillMaxWidth()
-                        .clip(RoundedCornerShape(8.dp))
-                        .background(shimmerBrush)
-            )
-        }
-
-        LazyColumn(
-            horizontalAlignment = Alignment.CenterHorizontally,
-            verticalArrangement = Arrangement.Top,
-            contentPadding = PaddingValues(top = 10.dp),
-            modifier = Modifier.fillMaxWidth(),
-        ) {
-            items(20) {
-                Row(
-                    modifier = Modifier.fillMaxWidth().padding(horizontal = 24.dp, vertical = 8.dp),
-                    verticalAlignment = Alignment.CenterVertically,
-                ) {
-                    Box(
-                        modifier =
-                            Modifier.size(iconSize).clip(CircleShape).background(shimmerBrush)
-                    )
-                    Spacer(modifier = Modifier.width(16.dp))
-                    Box(
-                        modifier =
-                            Modifier.height(20.dp)
-                                .weight(1f)
-                                .clip(RoundedCornerShape(4.dp))
-                                .background(shimmerBrush)
-                    )
-                    Spacer(modifier = Modifier.width(16.dp))
-                    Box(modifier = Modifier.size(24.dp).clip(CircleShape).background(shimmerBrush))
-                }
-            }
-        }
-    }
-}

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

@@ -4,7 +4,7 @@ import android.content.Context
 import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
+import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConf
 import com.zaneschepke.wireguardautotunnel.domain.repository.TunnelRepository
 import com.zaneschepke.wireguardautotunnel.ui.Route
 import com.zaneschepke.wireguardautotunnel.ui.screens.main.splittunnel.state.SplitOption
@@ -18,7 +18,6 @@ import dagger.hilt.android.qualifiers.ApplicationContext
 import java.text.Collator
 import java.util.*
 import javax.inject.Inject
-import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
@@ -50,7 +49,6 @@ constructor(
         tunnelId?.let { loadInitialState(it) }
     }
 
-    // TODO improve this loading experience
     private fun loadInitialState(tunnelId: Int) =
         viewModelScope.launch {
             val tunnel = tunnelRepository.getById(tunnelId) ?: return@launch
@@ -66,7 +64,7 @@ constructor(
 
             val installedPackages = packages.map { it.packageName }.toSet()
 
-            // remove uninstalled apps
+            // Remove uninstalled apps
             proxyInterface.includedApplications.retainAll { it in installedPackages }
             proxyInterface.excludedApplications.retainAll { it in installedPackages }
 
@@ -98,12 +96,13 @@ constructor(
                             selected,
                         )
                     }
-                    .sortedWith(compareBy(collator) { it.first.name })
+                    .sortedWith(
+                        compareByDescending<Pair<TunnelApp, Boolean>> { it.second }
+                            .thenBy(collator) { it.first.name }
+                    )
 
             allTunneledApps = tunneledApps
 
-            delay(500)
-
             _uiState.update {
                 SplitTunnelUiState(
                     loading = false,

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/main/splittunnel/state/SplitTunnelUiState.kt

@@ -1,6 +1,6 @@
 package com.zaneschepke.wireguardautotunnel.ui.screens.main.splittunnel.state
 
-import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
+import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConf
 
 data class SplitTunnelUiState(
     val loading: Boolean = true,

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

@@ -6,18 +6,53 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
-import androidx.compose.runtime.Composable
+import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
-import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
+import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConf
 import com.zaneschepke.wireguardautotunnel.ui.common.SectionDivider
 import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SurfaceSelectionGroupButton
+import com.zaneschepke.wireguardautotunnel.ui.navigation.LocalIsAndroidTV
 import com.zaneschepke.wireguardautotunnel.ui.screens.main.tunneloptions.components.*
+import com.zaneschepke.wireguardautotunnel.ui.screens.settings.components.AuthorizationPromptWrapper
+import com.zaneschepke.wireguardautotunnel.ui.state.AppViewState
 import com.zaneschepke.wireguardautotunnel.viewmodel.AppViewModel
+import com.zaneschepke.wireguardautotunnel.viewmodel.event.AppEvent
 
 @Composable
-fun TunnelOptionsScreen(tunnelConf: TunnelConf, viewModel: AppViewModel) {
+fun TunnelOptionsScreen(
+    tunnelConf: TunnelConf,
+    viewModel: AppViewModel,
+    appViewState: AppViewState,
+) {
+    val isTv = LocalIsAndroidTV.current
+
+    var showAuthPrompt by remember { mutableStateOf(!isTv) }
+    var isAuthorized by remember { mutableStateOf(isTv) }
+
+    if (appViewState.showModal == AppViewState.ModalType.QR) {
+
+        // Show authorization prompt if needed
+        if (showAuthPrompt) {
+            AuthorizationPromptWrapper(
+                onDismiss = { showAuthPrompt = false },
+                onSuccess = {
+                    showAuthPrompt = false
+                    isAuthorized = true
+                },
+                viewModel = viewModel,
+            )
+        }
+        if (isAuthorized) {
+            QrCodeDialog(
+                tunnelConf = tunnelConf,
+                onDismiss = {
+                    viewModel.handleEvent(AppEvent.SetShowModal(AppViewState.ModalType.NONE))
+                },
+            )
+        }
+    }
 
     Column(
         horizontalAlignment = Alignment.Start,

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

@@ -7,7 +7,7 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
 import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
+import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConf
 import com.zaneschepke.wireguardautotunnel.ui.Route
 import com.zaneschepke.wireguardautotunnel.ui.common.button.ForwardButton
 import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SelectionItem

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

@@ -9,7 +9,7 @@ import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.unit.dp
 import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
+import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConf
 import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SelectionItem
 import com.zaneschepke.wireguardautotunnel.ui.common.config.SubmitConfigurationTextBox
 import com.zaneschepke.wireguardautotunnel.util.Constants

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

@@ -7,7 +7,7 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
 import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
+import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConf
 import com.zaneschepke.wireguardautotunnel.ui.common.button.ScaledSwitch
 import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SelectionItem
 import com.zaneschepke.wireguardautotunnel.viewmodel.AppViewModel

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

@@ -7,7 +7,7 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
 import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
+import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConf
 import com.zaneschepke.wireguardautotunnel.ui.common.button.ScaledSwitch
 import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SelectionItem
 import com.zaneschepke.wireguardautotunnel.viewmodel.AppViewModel

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

@@ -0,0 +1,190 @@
+package com.zaneschepke.wireguardautotunnel.ui.screens.main.tunneloptions.components
+
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.Check
+import androidx.compose.material.icons.outlined.VpnKey
+import androidx.compose.material3.AlertDialog
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.MultiChoiceSegmentedButtonRow
+import androidx.compose.material3.SegmentedButton
+import androidx.compose.material3.SegmentedButtonDefaults
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.DisposableEffect
+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.graphics.Color
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.window.DialogProperties
+import com.zaneschepke.wireguardautotunnel.MainActivity
+import com.zaneschepke.wireguardautotunnel.R
+import com.zaneschepke.wireguardautotunnel.domain.enums.ConfigType
+import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConf
+import com.zaneschepke.wireguardautotunnel.util.extensions.setScreenBrightness
+import io.github.alexzhirkevich.qrose.options.QrBallShape
+import io.github.alexzhirkevich.qrose.options.QrBrush
+import io.github.alexzhirkevich.qrose.options.QrErrorCorrectionLevel
+import io.github.alexzhirkevich.qrose.options.QrFrameShape
+import io.github.alexzhirkevich.qrose.options.QrOptions
+import io.github.alexzhirkevich.qrose.options.QrPixelShape
+import io.github.alexzhirkevich.qrose.options.circle
+import io.github.alexzhirkevich.qrose.options.roundCorners
+import io.github.alexzhirkevich.qrose.options.solid
+import io.github.alexzhirkevich.qrose.rememberQrCodePainter
+
+@Composable
+fun QrCodeDialog(tunnelConf: TunnelConf, onDismiss: () -> Unit) {
+    val context = LocalContext.current
+    val activity = context as? MainActivity
+
+    // Handle screen brightness
+    DisposableEffect(Unit) {
+        activity?.setScreenBrightness(1.0f)
+        onDispose { activity?.setScreenBrightness(-1f) }
+    }
+
+    QrCodeAlertDialog(tunnelConf = tunnelConf, onDismiss = onDismiss)
+}
+
+@Composable
+private fun QrCodeAlertDialog(tunnelConf: TunnelConf, onDismiss: () -> Unit) {
+    Surface(color = Color.White, tonalElevation = 0.dp) {
+        AlertDialog(
+            containerColor = Color.White,
+            onDismissRequest = onDismiss,
+            confirmButton = {
+                TextButton(onClick = onDismiss) {
+                    Text(stringResource(R.string.done), color = MaterialTheme.colorScheme.surface)
+                }
+            },
+            title = {
+                Text(
+                    text = tunnelConf.name,
+                    color = Color.Black,
+                    style = MaterialTheme.typography.titleLarge,
+                )
+            },
+            text = { QrCodeContent(tunnelConf = tunnelConf) },
+            properties = DialogProperties(usePlatformDefaultWidth = true),
+        )
+    }
+}
+
+@Composable
+private fun QrCodeContent(tunnelConf: TunnelConf) {
+    var selectedOption by remember { mutableStateOf(ConfigType.WG) }
+    val qrCodeText =
+        when (selectedOption) {
+            ConfigType.AM -> tunnelConf.toAmConfig().toAwgQuickString(true)
+            ConfigType.WG -> tunnelConf.toWgConfig().toWgQuickString(true)
+        }
+
+    Column(
+        horizontalAlignment = Alignment.CenterHorizontally,
+        verticalArrangement = Arrangement.spacedBy(12.dp, Alignment.Top),
+    ) {
+        val qrCodePainter = rememberQrCodePainter(data = qrCodeText, options = createQrOptions())
+        Image(
+            painter = qrCodePainter,
+            contentDescription = stringResource(R.string.show_qr),
+            modifier =
+                Modifier.size(300.dp)
+                    .align(Alignment.CenterHorizontally)
+                    .padding(16.dp)
+                    .background(Color.White),
+        )
+        ConfigTypeSelector(
+            selectedOption = selectedOption,
+            onOptionSelected = { selectedOption = it },
+        )
+    }
+}
+
+@Composable
+private fun ConfigTypeSelector(selectedOption: ConfigType, onOptionSelected: (ConfigType) -> Unit) {
+    MultiChoiceSegmentedButtonRow(modifier = Modifier.fillMaxWidth().padding(horizontal = 24.dp)) {
+        ConfigType.entries.sortedDescending().forEachIndexed { index, entry ->
+            val isActive = selectedOption == entry
+            val typeName =
+                stringResource(
+                    when (entry) {
+                        ConfigType.AM -> R.string.amnezia
+                        ConfigType.WG -> R.string.wireguard
+                    }
+                )
+            SegmentedButton(
+                shape =
+                    SegmentedButtonDefaults.itemShape(
+                        index = index,
+                        count = ConfigType.entries.size,
+                        baseShape = RoundedCornerShape(8.dp),
+                    ),
+                icon = {
+                    SegmentedButtonDefaults.Icon(
+                        active = isActive,
+                        activeContent = {
+                            Icon(
+                                imageVector = Icons.Outlined.Check,
+                                contentDescription = stringResource(R.string.select),
+                                tint = MaterialTheme.colorScheme.primary,
+                                modifier = Modifier.size(SegmentedButtonDefaults.IconSize),
+                            )
+                        },
+                    ) {
+                        Icon(
+                            imageVector = Icons.Outlined.VpnKey,
+                            contentDescription = typeName,
+                            tint = Color.Black,
+                            modifier = Modifier.size(SegmentedButtonDefaults.IconSize),
+                        )
+                    }
+                },
+                colors =
+                    SegmentedButtonDefaults.colors()
+                        .copy(
+                            activeContainerColor = Color.White,
+                            inactiveContainerColor = Color.White,
+                        ),
+                onCheckedChange = { onOptionSelected(entry) },
+                checked = isActive,
+            ) {
+                Text(
+                    text = typeName,
+                    color = Color.Black,
+                    style = MaterialTheme.typography.labelMedium,
+                )
+            }
+        }
+    }
+}
+
+private fun createQrOptions(): QrOptions = QrOptions {
+    shapes {
+        darkPixel = QrPixelShape.circle()
+        ball = QrBallShape.circle()
+        frame = QrFrameShape.roundCorners(0.2f)
+    }
+    colors {
+        dark = QrBrush.solid(Color.Black)
+        frame = QrBrush.solid(Color.Black)
+        ball = QrBrush.solid(Color.Black)
+    }
+    errorCorrectionLevel = QrErrorCorrectionLevel.Medium
+}

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

@@ -7,7 +7,7 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
 import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
+import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConf
 import com.zaneschepke.wireguardautotunnel.ui.common.button.ScaledSwitch
 import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SelectionItem
 import com.zaneschepke.wireguardautotunnel.viewmodel.AppViewModel

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

@@ -7,7 +7,7 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
 import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
+import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConf
 import com.zaneschepke.wireguardautotunnel.ui.Route
 import com.zaneschepke.wireguardautotunnel.ui.common.button.ForwardButton
 import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SelectionItem

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/settings/advanced/components/RemoteControlItem.kt

@@ -8,20 +8,19 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalClipboardManager
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.text.style.TextOverflow
 import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.ui.common.button.ScaledSwitch
 import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SelectionItem
+import com.zaneschepke.wireguardautotunnel.ui.common.functions.rememberClipboardHelper
 import com.zaneschepke.wireguardautotunnel.ui.state.AppUiState
 import com.zaneschepke.wireguardautotunnel.viewmodel.AppViewModel
 import com.zaneschepke.wireguardautotunnel.viewmodel.event.AppEvent
 
 @Composable
 fun RemoteControlItem(uiState: AppUiState, viewModel: AppViewModel): SelectionItem {
-    val clipboardManager = LocalClipboardManager.current
+    val clipboardManager = rememberClipboardHelper()
 
     return SelectionItem(
         leadingIcon = Icons.Filled.SmartToy,
@@ -42,8 +41,7 @@ fun RemoteControlItem(uiState: AppUiState, viewModel: AppViewModel): SelectionIt
                             ),
                         maxLines = 1,
                         overflow = TextOverflow.Ellipsis,
-                        modifier =
-                            Modifier.clickable { clipboardManager.setText(AnnotatedString(key)) },
+                        modifier = Modifier.clickable { clipboardManager.copy(key) },
                     )
                 }
             }

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

@@ -23,25 +23,21 @@ fun DisplayScreen(appUiState: AppUiState, viewModel: AppViewModel) {
         verticalArrangement = Arrangement.spacedBy(24.dp, Alignment.Top),
         modifier = Modifier.fillMaxSize().padding(top = 24.dp).padding(horizontal = 24.dp),
     ) {
-        IconSurfaceButton(
-            title = stringResource(R.string.automatic),
-            onClick = { viewModel.handleEvent(AppEvent.SetTheme(Theme.AUTOMATIC)) },
-            selected = appUiState.appState.theme == Theme.AUTOMATIC,
-        )
-        IconSurfaceButton(
-            title = stringResource(R.string.light),
-            onClick = { viewModel.handleEvent(AppEvent.SetTheme(Theme.LIGHT)) },
-            selected = appUiState.appState.theme == Theme.LIGHT,
-        )
-        IconSurfaceButton(
-            title = stringResource(R.string.dark),
-            onClick = { viewModel.handleEvent(AppEvent.SetTheme(Theme.DARK)) },
-            selected = appUiState.appState.theme == Theme.DARK,
-        )
-        IconSurfaceButton(
-            title = stringResource(R.string.dynamic),
-            onClick = { viewModel.handleEvent(AppEvent.SetTheme(Theme.DYNAMIC)) },
-            selected = appUiState.appState.theme == Theme.DYNAMIC,
-        )
+        enumValues<Theme>().forEach {
+            val title =
+                when (it) {
+                    Theme.DARK -> stringResource(R.string.dark)
+                    Theme.LIGHT -> stringResource(R.string.light)
+                    Theme.AUTOMATIC -> stringResource(R.string.automatic)
+                    Theme.DYNAMIC -> stringResource(R.string.dynamic)
+                    Theme.DARKER -> stringResource(R.string.darker)
+                    Theme.AMOLED -> stringResource(R.string.amoled)
+                }
+            IconSurfaceButton(
+                title = title,
+                onClick = { viewModel.handleEvent(AppEvent.SetTheme(it)) },
+                selected = appUiState.appState.theme == it,
+            )
+        }
     }
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/settings/logs/components/LogItem.kt

@@ -11,17 +11,16 @@ import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.platform.LocalClipboardManager
-import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import com.zaneschepke.logcatter.model.LogMessage
+import com.zaneschepke.wireguardautotunnel.ui.common.functions.rememberClipboardHelper
 import com.zaneschepke.wireguardautotunnel.ui.common.text.LogTypeLabel
 
 @Composable
 fun LogItem(log: LogMessage) {
-    val clipboardManager = LocalClipboardManager.current
+    val clipboardManager = rememberClipboardHelper()
     val fontSize = 10.sp
 
     Row(
@@ -32,7 +31,7 @@ fun LogItem(log: LogMessage) {
                 .clickable(
                     interactionSource = remember { MutableInteractionSource() },
                     indication = null,
-                    onClick = { clipboardManager.setText(AnnotatedString(log.toString())) },
+                    onClick = { clipboardManager.copy(log.toString()) },
                 ),
     ) {
         Text(text = log.tag, modifier = Modifier.fillMaxSize(0.3f), fontSize = fontSize)