start sticky

.editorconfig

@@ -0,0 +1,97 @@
+root = true
+
+[*]
+charset = utf-8
+indent_size = 4
+indent_style = tab
+max_line_length = 150
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[{*.kt,*.kts}]
+ij_continuation_indent_size = 4
+ij_java_names_count_to_use_import_on_demand = 9999
+ij_kotlin_align_in_columns_case_branch = false
+ij_kotlin_align_multiline_binary_operation = false
+ij_kotlin_align_multiline_extends_list = false
+ij_kotlin_align_multiline_method_parentheses = false
+ij_kotlin_align_multiline_parameters = true
+ij_kotlin_align_multiline_parameters_in_calls = false
+ij_kotlin_assignment_wrap = normal
+ij_kotlin_blank_lines_after_class_header = 0
+ij_kotlin_blank_lines_around_block_when_branches = 0
+ij_kotlin_blank_lines_before_declaration_with_comment_or_annotation_on_separate_line = 1
+ij_kotlin_block_comment_at_first_column = true
+ij_kotlin_call_parameters_new_line_after_left_paren = true
+ij_kotlin_call_parameters_right_paren_on_new_line = false
+ij_kotlin_catch_on_new_line = false
+ij_kotlin_continuation_indent_for_chained_calls = true
+ij_kotlin_continuation_indent_for_expression_bodies = true
+ij_kotlin_continuation_indent_in_argument_lists = true
+ij_kotlin_continuation_indent_in_elvis = false
+ij_kotlin_continuation_indent_in_if_conditions = false
+ij_kotlin_continuation_indent_in_parameter_lists = false
+ij_kotlin_continuation_indent_in_supertype_lists = false
+ij_kotlin_else_on_new_line = false
+ij_kotlin_enum_constants_wrap = off
+ij_kotlin_extends_list_wrap = normal
+ij_kotlin_field_annotation_wrap = split_into_lines
+ij_kotlin_finally_on_new_line = false
+ij_kotlin_if_rparen_on_new_line = false
+ij_kotlin_import_nested_classes = false
+ij_kotlin_insert_whitespaces_in_simple_one_line_method = true
+ij_kotlin_keep_blank_lines_before_right_brace = 2
+ij_kotlin_keep_blank_lines_in_code = 2
+ij_kotlin_keep_blank_lines_in_declarations = 2
+ij_kotlin_keep_first_column_comment = true
+ij_kotlin_keep_indents_on_empty_lines = false
+ij_kotlin_keep_line_breaks = true
+ij_kotlin_lbrace_on_next_line = false
+ij_kotlin_line_comment_add_space = false
+ij_kotlin_line_comment_at_first_column = true
+ij_kotlin_method_annotation_wrap = split_into_lines
+ij_kotlin_method_call_chain_wrap = normal
+ij_kotlin_method_parameters_new_line_after_left_paren = true
+ij_kotlin_method_parameters_right_paren_on_new_line = true
+ij_kotlin_name_count_to_use_star_import = 9999
+ij_kotlin_name_count_to_use_star_import_for_members = 9999
+ij_kotlin_parameter_annotation_wrap = off
+ij_kotlin_space_after_comma = true
+ij_kotlin_space_after_extend_colon = true
+ij_kotlin_space_after_type_colon = true
+ij_kotlin_space_before_catch_parentheses = true
+ij_kotlin_space_before_comma = false
+ij_kotlin_space_before_extend_colon = true
+ij_kotlin_space_before_for_parentheses = true
+ij_kotlin_space_before_if_parentheses = true
+ij_kotlin_space_before_lambda_arrow = true
+ij_kotlin_space_before_type_colon = false
+ij_kotlin_space_before_when_parentheses = true
+ij_kotlin_space_before_while_parentheses = true
+ij_kotlin_spaces_around_additive_operators = true
+ij_kotlin_spaces_around_assignment_operators = true
+ij_kotlin_spaces_around_equality_operators = true
+ij_kotlin_spaces_around_function_type_arrow = true
+ij_kotlin_spaces_around_logical_operators = true
+ij_kotlin_spaces_around_multiplicative_operators = true
+ij_kotlin_spaces_around_range = false
+ij_kotlin_spaces_around_relational_operators = true
+ij_kotlin_spaces_around_unary_operator = false
+ij_kotlin_spaces_around_when_arrow = true
+ij_kotlin_variable_annotation_wrap = off
+ij_kotlin_while_on_new_line = false
+ij_kotlin_wrap_elvis_expressions = 1
+ij_kotlin_wrap_expression_body_functions = 1
+ij_kotlin_wrap_first_method_in_call_chain = false
+#compose
+ktlint_standard_filename = disabled
+ktlint_standard_no-wildcard-imports = disabled
+ktlint_standard_function-naming = disabled
+ktlint_standard_property-naming = disabled
+ktlint_standard_package-naming = disabled
+ktlint_function_naming_ignore_when_annotated_with = Composable
+ktlint_code_style = android_studio
+ktlint_standard_import-ordering = disabled
+ktlint_standard_package-naming = disabled
+ij_kotlin_allow_trailing_comma = true
+ij_kotlin_allow_trailing_comma_on_call_site = true

.github/workflows/build.yml

@@ -1,7 +1,4 @@
 name: build
-permissions:
-  contents: read
-
 on:
   workflow_dispatch:
     inputs:
@@ -15,14 +12,6 @@ on:
           - prerelease
           - nightly
           - release
-      flavor:
-        type: choice
-        description: "Product flavor"
-        required: true
-        default: fdroid
-        options:
-          - fdroid
-          - standalone
     secrets:
       SIGNING_KEY_ALIAS:
         required: false
@@ -41,11 +30,6 @@ on:
         description: "Build type"
         required: true
         default: debug
-      flavor:
-        type: string
-        description: "Product flavor"
-        required: false
-        default: fdroid
     secrets:
       SIGNING_KEY_ALIAS:
         required: false
@@ -57,7 +41,6 @@ on:
         required: false
       KEYSTORE:
         required: false
-
 env:
   UPLOAD_DIR_ANDROID: android_artifacts
 
@@ -74,8 +57,6 @@ jobs:
       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:
@@ -84,6 +65,9 @@ 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
@@ -91,37 +75,51 @@ jobs:
           fileName: ${{ env.KEY_STORE_FILE }}
           fileDir: ${{ env.KEY_STORE_LOCATION }}
           encodedString: ${{ secrets.KEYSTORE }}
+
+      # create keystore path for gradle to read
       - name: Create keystore path env var
         if: ${{ inputs.build_type != 'debug' }}
         run: |
           store_path=${{ env.KEY_STORE_LOCATION }}${{ env.KEY_STORE_FILE }}
           echo "KEY_STORE_PATH=$store_path" >> $GITHUB_ENV
 
-      - name: Build APK
+      - 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' }}
         run: |
-          flavor=${{ inputs.flavor }}
+          git config --global user.name 'GitHub Actions'
-          build_type=${{ inputs.build_type }}
+          git config --global user.email 'actions@github.com'
-          case $build_type in
+          git add versionCode.txt
-            "release")
+          git commit -m "Automated build update"
-              ./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/${{ inputs.flavor }}/${{ inputs.build_type }}/.*\.apk$' -type f | head -1 | tail -c+2)" >> $GITHUB_OUTPUT
+        run: echo "path=$(find . -regex '^.*/build/outputs/apk/fdroid/${{ inputs.build_type }}/.*\.apk$' -type f | head -1 | tail -c+2)" >> $GITHUB_OUTPUT
-      - name: Upload APK
+
+      - name: Upload release apk
         uses: actions/upload-artifact@v4
         with:
-          name: android_artifacts_${{ inputs.flavor }}
+          name: ${{ env.UPLOAD_DIR_ANDROID }}
-          path: app/build/outputs/apk/${{ inputs.flavor }}/${{ inputs.build_type  }}/wgtunnel-${{ inputs.flavor }}${{ inputs.flavor == 'fdroid' && '-release' || '' }}-*.apk
+          path: ${{github.workspace}}/${{ steps.apk-path.outputs.path }}
           retention-days: 1
-          if-no-files-found: warn

.github/workflows/nightly.yml

@@ -1,127 +0,0 @@
-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.PAT }}
-        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/on-issue.yml

@@ -0,0 +1,20 @@
+name: on-issue
+
+on:
+  issues:
+    types: [ opened, closed, reopened ]
+
+
+jobs:
+
+  on-issue:
+    name: On new issue
+    runs-on: ubuntu-latest
+    steps:
+      - name: Send Telegram Message
+        run: |
+          msg_text='${{ github.actor }} updated an issue:
+            status: ${{ github.event.issue.state }} - #${{ github.event.issue.number }} ${{ github.event.issue.title }}
+            https://github.com/zaneschepke/wgtunnel/issues/${{ github.event.issue.number }}'
+          curl -s -X POST 'https://api.telegram.org/bot${{ secrets.TELEGRAM_TOKEN }}/sendMessage' \
+          -d "chat_id=${{ secrets.TELEGRAM_TO }}&text=${msg_text}&message_thread_id=${{ secrets.TELEGRAM_TOPIC }}"

.github/workflows/on-pr.yml

@@ -1,6 +1,4 @@
 name: on-pr
-permissions:
-  contents: read
 
 on:
     workflow_dispatch:
@@ -21,5 +19,5 @@ jobs:
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
 
-      - name: Run ktfmt
+      - name: Run ktlint
-        run: ./gradlew ktfmtCheck
+        run: ./gradlew ktlintCheck

.github/workflows/on-publish.yml

@@ -0,0 +1,21 @@
+name: on-publish
+
+on:
+  release:
+    types: [ published ]
+
+
+jobs:
+
+  on-publish:
+    name: On publish
+    runs-on: ubuntu-latest
+    steps:
+      - name: Send Telegram Message
+        run: |
+          msg_text='${{ github.actor }} published a new release:
+            Release: ${{ github.event.release.tag_name }}
+            ${{ github.event.release.body }}
+            https://github.com/zaneschepke/wgtunnel/releases/tag/${{ github.event.release.tag_name }}'
+          curl -s -X POST 'https://api.telegram.org/bot${{ secrets.TELEGRAM_TOKEN }}/sendMessage' \
+          -d "chat_id=${{ secrets.TELEGRAM_TO }}&text=${msg_text}&message_thread_id=${{ secrets.TELEGRAM_TOPIC }}"

.github/workflows/publish.yml

@@ -1,17 +1,13 @@
 name: publish
-permissions:
-  contents: write
-  packages: write
 
 on:
-  push:
+  schedule:
-    tags:
+  - cron: "4 3 * * *"
-      - '[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
@@ -26,69 +22,76 @@ on:
         options:
           - none
           - prerelease
+          - nightly
           - release
         default: release
         required: true
       tag_name:
         description: "Tag name for release"
         required: false
-        default: 1.1.1
+        default: nightly
-      flavor:
-        type: choice
-        description: "Product flavor"
-        required: true
-        default: standalone
-        options:
-          - fdroid
-          - standalone
   workflow_call:
-    inputs:
+env:
-      flavor:
+  UPLOAD_DIR_ANDROID: android_artifacts
-        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 }}
 
-  build-fdroid:
+    steps:
-    if: ${{ github.event_name == 'push' || inputs.release_type == 'release' || inputs.flavor == 'fdroid' }}
+      - name: Checkout Repository
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0  # This fetches all history so we can check commits
+
+      - name: Check for new commits
+        id: check
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        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' }}
     uses: ./.github/workflows/build.yml
     secrets: inherit
     with:
-      build_type: ${{ github.event_name == 'push' && 'release' || inputs.release_type }}
+      build_type: ${{ inputs.release_type == '' && 'nightly' || 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:
-      - build-standalone
+      - check_commits
+      - build
+    if: ${{ needs.check_commits.outputs.has_new_commits > 0 && inputs.release_type != 'none' }}
     name: publish-github
     runs-on: ubuntu-latest
+    env:
+      GH_USER: ${{ secrets.GH_USER }}
+      # GH needed for gh cli
+      GH_TOKEN: ${{ secrets.GH_TOKEN }}
+      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"
+          tag: "latest"  # or any tag name you wish to use
           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
@@ -101,9 +104,22 @@ jobs:
         uses: requarks/changelog-action@v1
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
-          toTag: ${{ steps.latest_release.outputs.tag_name }}
+          toTag: ${{ github.event_name == 'schedule' && 'nightly' || steps.latest_release.outputs.tag_name }}
           fromTag: "latest"
-          writeToFile: false
+          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.GITHUB_TOKEN }}
+          branch: ${{ github.ref }}
 
       - name: Make download dir
         run: mkdir ${{ github.workspace }}/temp
@@ -111,43 +127,53 @@ jobs:
       - name: Download artifacts
         uses: actions/download-artifact@v4
         with:
-          pattern: android_artifacts_*
+          name: ${{ env.UPLOAD_DIR_ANDROID }}
           path: ${{ github.workspace }}/temp
-          merge-multiple: true
+
+      # 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
 
       - name: Set version release notes
-        if: ${{ github.event_name == 'push' || inputs.release_type == 'release' }}
+        if: ${{ inputs.release_type == 'release' }}
         run: |
-          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/${{ env.VERSION_CODE }}.txt)"
-          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: ${{ github.event_name != 'push' && inputs.release_type == 'prerelease' }}
+        if: ${{ 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" | head -n 1)
+          file_path=$(find ${{ github.workspace }}/temp -type f -iname "*.apk" | tail -n1)
-          if [ -z "$file_path" ]; then
+          echo "checksum=$(apksigner verify -print-certs $file_path | grep -Po "(?<=SHA-256 digest:) .*" | tr -d "[:blank:]")" >> $GITHUB_OUTPUT
-            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
+
+      - name: Create Release with Fastlane changelog notes
         id: create_release
         uses: softprops/action-gh-release@v2
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           body: |
             ${{ env.RELEASE_NOTES }}
 
-            SHA-256 fingerprints for the 4096-bit signing certificate:
+            SHA-256 fingerprint for the 4096-bit signing certificate:
             ```sh
             ${{ steps.checksum.outputs.checksum }}
             ```
@@ -159,31 +185,29 @@ jobs:
 
             ### Changelog
             ${{ steps.changelog.outputs.changes }}
-          tag_name: ${{ github.event_name == 'push' && github.ref_name || github.event.inputs.tag_name }}
+          tag_name: ${{ env.TAG_NAME }}
-          name: ${{ github.event_name == 'push' && github.ref_name || github.event.inputs.tag_name }}
+          name: ${{ env.TAG_NAME }}
           draft: false
-          prerelease: ${{ github.event_name != 'push' && inputs.release_type == 'prerelease' }}
+          prerelease: ${{ inputs.release_type == 'prerelease' || inputs.release_type == '' || inputs.release_type == 'nightly' }}
-          make_latest: ${{ github.event_name == 'push' || inputs.release_type == 'release' }}
+          make_latest: ${{ inputs.release_type == 'release' }}
           files: |
-            ${{ github.workspace }}/temp/**/*.apk
+            ${{ github.workspace }}/temp/*
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-  publish-fdroid-public:
+  publish-fdroid:
     runs-on: ubuntu-latest
     needs:
-      - build-fdroid
+      - build
-    if: ${{ github.event_name == 'push' || inputs.release_type == 'release' }}
+    if: inputs.release_type == 'release'
     steps:
       - name: Dispatch update for fdroid repo
         uses: peter-evans/repository-dispatch@v3
         with:
           token: ${{ secrets.PAT }}
-          repository: wgtunnel/fdroid
+          repository: zaneschepke/fdroid
           event-type: fdroid-update
 
   publish-play:
-    if: ${{ github.event_name == 'push' || inputs.track != 'none' }}
+    if: ${{ inputs.track != 'none' && inputs.track != '' }}
     name: Publish to Google Play
     runs-on: ubuntu-latest
 
@@ -193,6 +217,8 @@ jobs:
       SIGNING_STORE_PASSWORD: ${{ secrets.SIGNING_STORE_PASSWORD }}
       KEY_STORE_FILE: 'android_keystore.jks'
       KEY_STORE_LOCATION: ${{ github.workspace }}/app/keystore/
+      GH_USER: ${{ secrets.GH_USER }}
+      GH_TOKEN: ${{ secrets.GH_TOKEN }}
 
     steps:
       - uses: actions/checkout@v4
@@ -233,6 +259,5 @@ jobs:
           bundler-cache: true
 
       - name: Distribute app to Prod track 🚀
-        run: |
+        run: (cd ${{ github.workspace }} && bundle install && bundle exec fastlane ${{ inputs.track }})
-          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/

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright ©  2023-2025 Zane Schepke
+Copyright (c) 2023 WG Auto Tunnel
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -4,7 +4,7 @@ WG Tunnel
 
 <div align="center">
 
-An alternative Android client app for [WireGuard](https://www.wireguard.com/)
+An alternative Android client app for [WireGuard®](https://www.wireguard.com/)
 and [AmneziaWG](https://docs.amnezia.org/documentation/amnezia-wg/)
 <br />
 <br />
@@ -23,14 +23,14 @@ and [AmneziaWG](https://docs.amnezia.org/documentation/amnezia-wg/)
 [![Google Play](https://img.shields.io/badge/Google_Play-414141?style=for-the-badge&logo=google-play&logoColor=white)](https://play.google.com/store/apps/details?id=com.zaneschepke.wireguardautotunnel)
 [![F-Droid](https://img.shields.io/static/v1?style=for-the-badge&message=F-Droid&color=1976D2&logo=F-Droid&logoColor=FFFFFF&label=)](https://f-droid.org/packages/com.zaneschepke.wireguardautotunnel/)
 [![Personal](https://img.shields.io/static/v1?style=for-the-badge&message=Personal&color=1976D2&logo=F-Droid&logoColor=FFFFFF&label=)](https://github.com/zaneschepke/fdroid)
-[![Obtainium](https://img.shields.io/badge/Obtainium-414141?style=for-the-badge&logo=Obtainium&logoColor=white)](https://apps.obtainium.imranr.dev/redirect?r=obtainium://app/%7B%22id%22%3A%22com.zaneschepke.wireguardautotunnel%22%2C%22url%22%3A%22https%3A%2F%2Fgithub.com%2Fzaneschepke%2Fwgtunnel%22%2C%22author%22%3A%22zaneschepke%22%2C%22name%22%3A%22WG%20Tunnel%22%2C%22preferredApkIndex%22%3A0%2C%22additionalSettings%22%3A%22%7B%5C%22includePrereleases%5C%22%3Afalse%2C%5C%22fallbackToOlderReleases%5C%22%3Atrue%2C%5C%22filterReleaseTitlesByRegEx%5C%22%3A%5C%22%5C%22%2C%5C%22filterReleaseNotesByRegEx%5C%22%3A%5C%22%5C%22%2C%5C%22verifyLatestTag%5C%22%3Atrue%2C%5C%22sortMethodChoice%5C%22%3A%5C%22date%5C%22%2C%5C%22useLatestAssetDateAsReleaseDate%5C%22%3Afalse%2C%5C%22releaseTitleAsVersion%5C%22%3Afalse%2C%5C%22trackOnly%5C%22%3Afalse%2C%5C%22versionExtractionRegEx%5C%22%3A%5C%22%5C%22%2C%5C%22matchGroupToUse%5C%22%3A%5C%22%5C%22%2C%5C%22versionDetection%5C%22%3Atrue%2C%5C%22releaseDateAsVersion%5C%22%3Afalse%2C%5C%22useVersionCodeAsOSVersion%5C%22%3Afalse%2C%5C%22apkFilterRegEx%5C%22%3A%5C%22%5C%22%2C%5C%22invertAPKFilter%5C%22%3Afalse%2C%5C%22autoApkFilterByArch%5C%22%3Atrue%2C%5C%22appName%5C%22%3A%5C%22WG%20Tunnel%5C%22%2C%5C%22appAuthor%5C%22%3A%5C%22Zane%20Schepke%5C%22%2C%5C%22shizukuPretendToBeGooglePlay%5C%22%3Afalse%2C%5C%22allowInsecure%5C%22%3Afalse%2C%5C%22exemptFromBackgroundUpdates%5C%22%3Afalse%2C%5C%22skipUpdateNotifications%5C%22%3Afalse%2C%5C%22about%5C%22%3A%5C%22%5C%22%2C%5C%22refreshBeforeDownload%5C%22%3Afalse%7D%22%2C%22overrideSource%22%3Anull%7D)
 
 </div>
 
 <div align="center">
 
-[<img  src="https://img.shields.io/badge/Telegram-26A5E4.svg?style=for-the-badge&logo=Telegram&logoColor=white">](https://t.me/wgtunnel)
+[![Discord](https://img.shields.io/badge/Discord-%235865F2.svg?style=for-the-badge&logo=discord&logoColor=white)](https://discord.gg/rbRRNh6H7V)
-[<img src="https://img.shields.io/badge/Matrix-000000.svg?style=for-the-badge&logo=Matrix&logoColor=white">](https://matrix.to/#/#wg-tunnel-space:matrix.org)
+[![Telegram](https://img.shields.io/badge/Telegram-2CA5E0?style=for-the-badge&logo=telegram&logoColor=white)](https://t.me/wgtunnel)
+
 </div>
 
 <details open="open">
@@ -49,7 +49,7 @@ and [AmneziaWG](https://docs.amnezia.org/documentation/amnezia-wg/)
 <div style="text-align: left;">
 
 ## About
-Inspired by the official [wireguard-android](https://github.com/WireGuard/wireguard-android) app, WG Tunnel was created to address features and support missing from the official app. This app combines support for both [WireGuard](https://www.wireguard.com/)
+Inspired by the official [wireguard-android](https://github.com/WireGuard/wireguard-android) app, WG Tunnel was created to address features and support missing from the official app. This app combines support for both [WireGuard®](https://www.wireguard.com/)
 and [AmneziaWG](https://docs.amnezia.org/documentation/amnezia-wg/), with its primary feature of auto-tunneling (on-demand tunneling).
 
 </div>
@@ -61,14 +61,14 @@ and [AmneziaWG](https://docs.amnezia.org/documentation/amnezia-wg/), with its pr
 Thank you to the following:
 
 - All of the users that have helped contribute to the project with ideas, translations, feedback, bug reports, testing, and donations.
-- [WireGuard](https://www.wireguard.com/) - Jason A. Donenfeld (https://github.com/WireGuard/wireguard-android)
+- [WireGuard®](https://www.wireguard.com/) - © Jason A. Donenfeld (https://github.com/WireGuard/wireguard-android)
 
 - [AmneziaWG](https://docs.amnezia.org/documentation/amnezia-wg/) - Amnezia Team (https://github.com/amnezia-vpn/amneziawg-android)
 
 ## Screenshots
 
 </div>
-<div style="display: flex; flex-wrap: wrap; justify-content: left; gap: 10px;">
+<div style="display: flex; flex-wrap: wrap; justify-content: center; gap: 10px;">
  <img label="Main" src="fastlane/metadata/android/en-US/images/phoneScreenshots/main_screen.png" width="200" />
  <img label="Settings" src="fastlane/metadata/android/en-US/images/phoneScreenshots/settings_screen.png" width="200" />
   <img label="Auto" src="fastlane/metadata/android/en-US/images/phoneScreenshots/auto_screen.png" width="200" />

app/.gitignore

@@ -1,3 +1,2 @@
 /build
 /release
-/src/main/assets/licenses.json

app/build.gradle.kts

@@ -6,17 +6,36 @@ plugins {
 	alias(libs.plugins.ksp)
 	alias(libs.plugins.compose.compiler)
 	alias(libs.plugins.grgit)
-    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 }
+	androidResources {
+		generateLocaleConfig = true
+	}
 
+	// reproducibility
 	dependenciesInfo {
+		// Disables dependency metadata when building APKs.
 		includeInApk = false
+		// Disables dependency metadata when building Android App Bundles.
 		includeInBundle = false
 	}
 
@@ -24,18 +43,16 @@ android {
 		applicationId = Constants.APP_ID
 		minSdk = Constants.MIN_SDK
 		targetSdk = Constants.TARGET_SDK
-        versionCode = computeVersionCode()
+		versionCode = Constants.VERSION_CODE + versionCodeIncrement
-        versionName = computeVersionName()
+		versionName = determineVersionName()
 
 		ksp { arg("room.schemaLocation", "$projectDir/schemas") }
 
-        sourceSets { getByName("debug").assets.srcDirs(files("$projectDir/schemas")) }
+		sourceSets {
+			getByName("debug").assets.srcDirs(files("$projectDir/schemas")) // Room
+		}
 
-        buildConfigField(
+		buildConfigField("String[]", "LANGUAGES", "new String[]{ ${languageList().joinToString(separator = ", ") { "\"$it\"" }} }")
-            "String[]",
-            "LANGUAGES",
-            "new String[]{ ${languageList().joinToString(separator = ", ") { "\"$it\"" }} }",
-        )
 
 		testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
 		vectorDrawables { useSupportLibrary = true }
@@ -43,20 +60,17 @@ android {
 
 	signingConfigs {
 		create(Constants.RELEASE) {
-            storeFile = file(System.getenv("KEY_STORE_PATH") ?: "keystore/android_keystore.jks")
+			storeFile = getStoreFile()
-            storePassword =
+			storePassword = getSigningProperty(Constants.STORE_PASS_VAR)
-                LocalProperties.get("SIGNING_STORE_PASSWORD")
+			keyAlias = getSigningProperty(Constants.KEY_ALIAS_VAR)
-                    ?: System.getenv("SIGNING_STORE_PASSWORD")
+			keyPassword = getSigningProperty(Constants.KEY_PASS_VAR)
-            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")
+			listOf("libwg-go.so", "libwg-quick.so", "libwg.so"),
 		)
 
 		release {
@@ -70,9 +84,9 @@ android {
 			signingConfig = signingConfigs.getByName(Constants.RELEASE)
 			resValue("string", "provider", "\"${Constants.APP_NAME}.provider\"")
 		}
-
 		debug {
 			applicationIdSuffix = ".debug"
+			versionNameSuffix = "-debug"
 			resValue("string", "app_name", "WG Tunnel - Debug")
 			isDebuggable = true
 			resValue("string", "provider", "\"${Constants.APP_NAME}.provider.debug\"")
@@ -81,6 +95,7 @@ android {
 		create(Constants.PRERELEASE) {
 			initWith(buildTypes.getByName(Constants.RELEASE))
 			applicationIdSuffix = ".prerelease"
+			versionNameSuffix = "-pre"
 			resValue("string", "app_name", "WG Tunnel - Pre")
 			resValue("string", "provider", "\"${Constants.APP_NAME}.provider.pre\"")
 		}
@@ -88,43 +103,10 @@ android {
 		create(Constants.NIGHTLY) {
 			initWith(buildTypes.getByName(Constants.RELEASE))
 			applicationIdSuffix = ".nightly"
+			versionNameSuffix = "-nightly"
 			resValue("string", "app_name", "WG Tunnel - Nightly")
 			resValue("string", "provider", "\"${Constants.APP_NAME}.provider.nightly\"")
 		}
-    }
-
-    flavorDimensions.add("type")
-    productFlavors {
-        create("fdroid") {
-            dimension = "type"
-            buildConfigField("String", "FLAVOR", "\"fdroid\"")
-        }
-        create("google") {
-            dimension = "type"
-            buildConfigField("String", "FLAVOR", "\"google\"")
-        }
-        create("standalone") {
-            dimension = "type"
-            buildConfigField("String", "FLAVOR", "\"standalone\"")
-        }
-    }
-
-    compileOptions {
-        isCoreLibraryDesugaringEnabled = true
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
-    }
-    kotlinOptions { jvmTarget = Constants.JVM_TARGET }
-    buildFeatures {
-        compose = true
-        buildConfig = true
-    }
-    packaging { resources { excludes += "/META-INF/{AL2.0,LGPL2.1}" } }
-
-    licensee {
-        Constants.allowedLicenses.forEach { allow(it) }
-        Constants.allowedLicenseUrls.forEach { allowUrl(it) }
-    }
 
 		applicationVariants.all {
 			val variant = this
@@ -132,22 +114,43 @@ android {
 				.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}-${variant.flavorName}-" +
-                        "${Constants.APP_NAME}-fdroid-release-${variant.versionName}.apk"
+							"${variant.buildType.name}-${variant.versionName}.apk"
-                    } else {
-                        "${Constants.APP_NAME}-${variant.flavorName}-v${variant.versionName}.apk"
-                    }
 					output.outputFileName = outputFileName
 				}
 		}
 	}
+	flavorDimensions.add(Constants.TYPE)
+	productFlavors {
+		create("fdroid") {
+			dimension = Constants.TYPE
+			proguardFile("fdroid-rules.pro")
+		}
+		create("general") {
+			dimension = Constants.TYPE
+		}
+	}
+	compileOptions {
+		sourceCompatibility = JavaVersion.VERSION_17
+		targetCompatibility = JavaVersion.VERSION_17
+		isCoreLibraryDesugaringEnabled = true
+	}
+	kotlinOptions { jvmTarget = Constants.JVM_TARGET }
+	buildFeatures {
+		compose = true
+		buildConfig = true
+	}
+	packaging { resources { excludes += "/META-INF/{AL2.0,LGPL2.1}" } }
+}
 
 dependencies {
+
 	implementation(project(":logcatter"))
-    implementation(project(":networkmonitor"))
 
 	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))
@@ -157,8 +160,8 @@ dependencies {
 	implementation(libs.androidx.material3)
 	implementation(libs.androidx.appcompat)
 	implementation(libs.material)
-    implementation(libs.androidx.storage)
 
+	// test
 	testImplementation(libs.junit)
 	testImplementation(libs.androidx.junit)
 	androidTestImplementation(libs.androidx.junit)
@@ -169,72 +172,84 @@ 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)
 
+	// icons
+	implementation(libs.material.icons.extended)
+	// serialization
 	implementation(libs.kotlinx.serialization.json)
 
+	// barcode scanning
 	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)
-
-    implementation(libs.qrose)
-    implementation(libs.semver4j)
-
-    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)
 }
 
-tasks.register<Copy>("copyLicenseeJsonToAssets") {
+fun determineVersionName(): String {
-    dependsOn("licensee")
+	return with(getBuildTaskName().lowercase()) {
-    val outputAssets = layout.projectDirectory.dir("src/main/assets")
+		when {
-    from(layout.buildDirectory.file("reports/licensee/androidFdroidRelease/artifacts.json")) {
+			contains(Constants.NIGHTLY) || contains(Constants.PRERELEASE) ->
-        rename("artifacts.json", "licenses.json")
+				Constants.VERSION_NAME +
+					"-${grgitService.service.get().grgit.head().abbreviatedId}"
+			else -> Constants.VERSION_NAME
+		}
 	}
-    into(outputAssets)
 }
 
-tasks.named("preBuild") { dependsOn("copyLicenseeJsonToAssets") }
+val incrementVersionCode by tasks.registering {
+	doLast {
+		val versionFile = file("$rootDir/versionCode.txt")
+		if (versionFile.exists()) {
+			versionFile.writeText(versionCodeIncrement.toString())
+			println("Incremented versionCode to $versionCodeIncrement")
+		}
+	}
+}
 
-// https://gist.github.com/obfusk/61046e09cee352ae6dd109911534b12e#fix-proposed-by-linsui-disable-baseline-profiles
 tasks.whenTaskAdded {
-    if (name.contains("ArtProfile")) {
+	if (name.startsWith("assemble") && !name.lowercase().contains("debug")) {
-        enabled = false
+		dependsOn(incrementVersionCode)
 	}
 }

app/fdroid-rules.pro

@@ -0,0 +1,5 @@
+-dontwarn com.google.errorprone.annotations.**
+
+-keepclassmembers class * extends androidx.datastore.preferences.protobuf.GeneratedMessageLite {
+    <fields>;
+}

app/proguard-rules.pro

@@ -0,0 +1,24 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
+-keepclassmembers class * extends androidx.datastore.preferences.protobuf.GeneratedMessageLite {
+    <fields>;
+}

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

@@ -155,7 +155,9 @@
           "columnNames": [
             "id"
           ]
-        }
+        },
+        "indices": [],
+        "foreignKeys": []
       },
       {
         "tableName": "TunnelConfig",
@@ -225,18 +227,21 @@
             "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"
           },
           {
@@ -270,9 +275,11 @@
             "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

@@ -1,295 +0,0 @@
-{
-  "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/androidTest/java/com/zaneschepke/wireguardautotunnel/MigrationTest.kt

@@ -5,10 +5,10 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
 import com.zaneschepke.wireguardautotunnel.data.AppDatabase
 import com.zaneschepke.wireguardautotunnel.data.Queries
-import java.io.IOException
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
+import java.io.IOException
 
 @RunWith(AndroidJUnit4::class)
 class MigrationTest {
@@ -16,7 +16,10 @@ class MigrationTest {
 
 	@get:Rule
 	val helper: MigrationTestHelper =
-        MigrationTestHelper(InstrumentationRegistry.getInstrumentation(), AppDatabase::class.java)
+		MigrationTestHelper(
+			InstrumentationRegistry.getInstrumentation(),
+			AppDatabase::class.java,
+		)
 
 	@Test
 	@Throws(IOException::class)
@@ -25,7 +28,9 @@ class MigrationTest {
 			// Database has schema version 1. Insert some data using SQL queries.
 			// You can't use DAO classes because they expect the latest schema.
 			execSQL(Queries.createDefaultSettings())
-            execSQL(Queries.createTunnelConfig())
+			execSQL(
+				Queries.createTunnelConfig(),
+			)
 			// Prepare for the next version.
 			close()
 		}

app/src/full/AndroidManifest.xml

@@ -1,5 +0,0 @@
-<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

@@ -3,8 +3,13 @@
     xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
-
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />
     <!--foreground service exempt android 14-->
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SYSTEM_EXEMPTED" />
     <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM"
@@ -16,11 +21,10 @@
     <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
     <!--start service on boot permission-->
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+    <!--android tv support-->
 
 	<permission
 		android:name="${applicationId}.permission.CONTROL_TUNNELS"
-		android:label="@string/app_permission_title"
-		android:description="@string/app_permission_description"
 		android:icon="@mipmap/ic_launcher"
 		android:protectionLevel="dangerous" />
 
@@ -46,13 +50,12 @@
     <queries>
         <intent>
             <action android:name="android.intent.action.MAIN" />
-			<category android:name="android.intent.category.LAUNCHER" />
         </intent>
     </queries>
     <application
         android:name=".WireGuardAutoTunnel"
         android:allowBackup="false"
-        android:banner="@mipmap/ic_banner"
+        android:banner="@drawable/ic_banner"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:enableOnBackInvokedCallback="true"
         android:fullBackupContent="@xml/backup_rules"
@@ -62,14 +65,10 @@
         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:windowSoftInputMode="adjustNothing"
+			android:windowSoftInputMode="adjustResize"
             android:theme="@style/Theme.WireguardAutoTunnel"
 			android:configChanges="orientation|screenSize|keyboardHidden"
 			>
@@ -82,11 +81,15 @@
                 <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"
             android:enabled="true"
-            android:exported="false"
+            android:exported="true"
 			android:noHistory="true"
 			android:excludeFromRecents="true"
 			android:finishOnTaskLaunch="true"
@@ -113,7 +116,7 @@
         <service
             android:name=".core.service.tile.TunnelControlTile"
             android:exported="true"
-            android:icon="@drawable/ic_notification"
+            android:icon="@drawable/ic_launcher"
             android:label="@string/tunnel_control"
             android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
             <meta-data
@@ -130,7 +133,7 @@
         <service
             android:name=".core.service.tile.AutoTunnelControlTile"
             android:exported="true"
-            android:icon="@drawable/ic_notification"
+            android:icon="@drawable/ic_launcher"
             android:label="@string/auto_tunnel"
             android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
             <meta-data
@@ -163,14 +166,24 @@
 				<action android:name="android.net.VpnService" />
 			</intent-filter>
 		</service>
+
         <receiver
-            android:name=".core.broadcast.RestartReceiver"
+            android:name=".core.broadcast.BootReceiver"
             android:enabled="true"
             android:exported="false">
             <intent-filter>
+                <category android:name="android.intent.category.DEFAULT" />
+
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
+                <action android:name="android.intent.action.ACTION_BOOT_COMPLETED" />
                 <action android:name="android.intent.action.QUICKBOOT_POWERON" />
                 <action android:name="com.htc.intent.action.QUICKBOOT_POWERON" />
+            </intent-filter>
+        </receiver>
+		<receiver
+			android:name=".core.broadcast.AppUpdateReceiver"
+			android:exported="false">
+			<intent-filter>
 				<action android:name="android.intent.action.MY_PACKAGE_REPLACED" />
 			</intent-filter>
 		</receiver>
@@ -182,20 +195,6 @@
 				<action android:name="com.wireguard.android.action.REFRESH_TUNNEL_STATES" />
 			</intent-filter>
 		</receiver>
-		<!--custom security solution for easier user integration-->
-		<receiver
-			android:name=".core.broadcast.RemoteControlReceiver"
-			android:enabled="true"
-			android:exported="true" tools:ignore="ExportedReceiver">
-			<intent-filter>
-				<action android:name="com.zaneschepke.wireguardautotunnel.START_TUNNEL" />
-				<action android:name="com.zaneschepke.wireguardautotunnel.STOP_TUNNEL" />
-				<action android:name="com.zaneschepke.wireguardautotunnel.START_AUTO_TUNNEL" />
-				<action android:name="com.zaneschepke.wireguardautotunnel.STOP_AUTO_TUNNEL" />
-				<action android:name="com.zaneschepke.wireguardautotunnel.START_KILL_SWITCH" />
-				<action android:name="com.zaneschepke.wireguardautotunnel.STOP_KILL_SWITCH" />
-			</intent-filter>
-		</receiver>
 		<receiver
 			android:name=".core.broadcast.NotificationActionReceiver"
 			android:exported="false"

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

@@ -1,93 +1,90 @@
 package com.zaneschepke.wireguardautotunnel
 
-import android.Manifest
-import android.annotation.SuppressLint
 import android.content.Intent
-import android.content.pm.PackageManager
 import android.graphics.Color
 import android.os.Build
 import android.os.Bundle
-import android.provider.Settings
 import androidx.activity.SystemBarStyle
-import androidx.activity.compose.rememberLauncherForActivityResult
+import androidx.activity.compose.BackHandler
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
-import androidx.activity.result.ActivityResult
-import androidx.activity.result.contract.ActivityResultContracts
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
-import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.core.tween
-import androidx.compose.animation.slideInVertically
+import androidx.compose.animation.fadeIn
-import androidx.compose.animation.slideOutVertically
+import androidx.compose.animation.fadeOut
-import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.gestures.detectTapGestures
+import androidx.compose.foundation.layout.WindowInsets
-import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.material3.*
+import androidx.compose.foundation.layout.padding
-import androidx.compose.runtime.*
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.rounded.Home
+import androidx.compose.material.icons.rounded.QuestionMark
+import androidx.compose.material.icons.rounded.Settings
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.SnackbarData
+import androidx.compose.material3.SnackbarHost
+import androidx.compose.material3.surfaceColorAtElevation
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.input.pointer.pointerInput
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
-import androidx.core.content.ContextCompat
-import androidx.core.net.toUri
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
-import androidx.navigation.compose.currentBackStackEntryAsState
 import androidx.navigation.compose.rememberNavController
 import androidx.navigation.toRoute
-import com.zaneschepke.networkmonitor.NetworkMonitor
+import com.zaneschepke.wireguardautotunnel.core.shortcut.ShortcutManager
 import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelManager
+import com.zaneschepke.wireguardautotunnel.core.worker.ServiceWorker
 import com.zaneschepke.wireguardautotunnel.domain.repository.AppStateRepository
 import com.zaneschepke.wireguardautotunnel.ui.Route
-import com.zaneschepke.wireguardautotunnel.ui.common.dialog.VpnDeniedDialog
+import com.zaneschepke.wireguardautotunnel.ui.common.navigation.BottomNavBar
+import com.zaneschepke.wireguardautotunnel.ui.common.navigation.BottomNavItem
+import com.zaneschepke.wireguardautotunnel.ui.common.navigation.LocalNavController
 import com.zaneschepke.wireguardautotunnel.ui.common.snackbar.CustomSnackBar
-import com.zaneschepke.wireguardautotunnel.ui.navigation.LocalIsAndroidTV
+import com.zaneschepke.wireguardautotunnel.ui.common.snackbar.SnackbarControllerProvider
-import com.zaneschepke.wireguardautotunnel.ui.navigation.LocalNavController
+import com.zaneschepke.wireguardautotunnel.ui.screens.main.ConfigScreen
-import com.zaneschepke.wireguardautotunnel.ui.navigation.components.BottomNavbar
-import com.zaneschepke.wireguardautotunnel.ui.navigation.components.DynamicTopAppBar
-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.OptionsScreen
-import com.zaneschepke.wireguardautotunnel.ui.screens.main.config.ConfigScreen
+import com.zaneschepke.wireguardautotunnel.ui.screens.main.PinLockScreen
-import com.zaneschepke.wireguardautotunnel.ui.screens.main.splittunnel.SplitTunnelScreen
+import com.zaneschepke.wireguardautotunnel.ui.screens.main.ScannerScreen
-import com.zaneschepke.wireguardautotunnel.ui.screens.main.tunneloptions.TunnelOptionsScreen
+import com.zaneschepke.wireguardautotunnel.ui.screens.main.SplitTunnelScreen
-import com.zaneschepke.wireguardautotunnel.ui.screens.pin.PinLockScreen
+import com.zaneschepke.wireguardautotunnel.ui.screens.main.TunnelAutoTunnelScreen
+import com.zaneschepke.wireguardautotunnel.ui.screens.settings.AdvancedScreen
+import com.zaneschepke.wireguardautotunnel.ui.screens.settings.AppearanceScreen
+import com.zaneschepke.wireguardautotunnel.ui.screens.settings.DisplayScreen
+import com.zaneschepke.wireguardautotunnel.ui.screens.settings.KillSwitchScreen
+import com.zaneschepke.wireguardautotunnel.ui.screens.settings.LanguageScreen
+import com.zaneschepke.wireguardautotunnel.ui.screens.settings.LocationDisclosureScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.settings.SettingsScreen
-import com.zaneschepke.wireguardautotunnel.ui.screens.settings.advanced.SettingsAdvancedScreen
+import com.zaneschepke.wireguardautotunnel.ui.screens.settings.autotunnel.AutoTunnelScreen
-import com.zaneschepke.wireguardautotunnel.ui.screens.settings.appearance.AppearanceScreen
+import com.zaneschepke.wireguardautotunnel.ui.screens.support.LogsScreen
-import com.zaneschepke.wireguardautotunnel.ui.screens.settings.appearance.display.DisplayScreen
-import com.zaneschepke.wireguardautotunnel.ui.screens.settings.appearance.language.LanguageScreen
-import com.zaneschepke.wireguardautotunnel.ui.screens.settings.killswitch.KillSwitchScreen
-import com.zaneschepke.wireguardautotunnel.ui.screens.settings.logs.LogsScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.support.SupportScreen
-import com.zaneschepke.wireguardautotunnel.ui.screens.support.license.LicenseScreen
 import com.zaneschepke.wireguardautotunnel.ui.theme.WireguardAutoTunnelTheme
-import com.zaneschepke.wireguardautotunnel.util.extensions.isRunningOnTv
+import com.zaneschepke.wireguardautotunnel.util.Constants
+import com.zaneschepke.wireguardautotunnel.util.extensions.requestAutoTunnelTileServiceUpdate
 import com.zaneschepke.wireguardautotunnel.viewmodel.AppViewModel
-import com.zaneschepke.wireguardautotunnel.viewmodel.event.AppEvent
 import dagger.hilt.android.AndroidEntryPoint
 import javax.inject.Inject
 import kotlin.system.exitProcess
-import org.amnezia.awg.backend.GoBackend.VpnService
-import timber.log.Timber
 
 @AndroidEntryPoint
 class MainActivity : AppCompatActivity() {
 
-    @Inject lateinit var appStateRepository: AppStateRepository
+	@Inject
+	lateinit var appStateRepository: AppStateRepository
 
-    @Inject lateinit var tunnelManager: TunnelManager
+	@Inject
+	lateinit var tunnelManager: TunnelManager
 
-    @Inject lateinit var networkMonitor: NetworkMonitor
+	@Inject
+	lateinit var shortcutManager: ShortcutManager
 
-    private var lastLocationPermissionState: Boolean? = null
-
-    @SuppressLint("BatteryLife")
 	override fun onCreate(savedInstanceState: Bundle?) {
 		enableEdgeToEdge(
 			statusBarStyle = SystemBarStyle.Companion.auto(Color.TRANSPARENT, Color.TRANSPARENT),
@@ -101,223 +98,163 @@ class MainActivity : AppCompatActivity() {
 		val viewModel by viewModels<AppViewModel>()
 
 		installSplashScreen().apply {
-            setKeepOnScreenCondition { !viewModel.appViewState.value.isAppReady }
+			setKeepOnScreenCondition {
+				!viewModel.isAppReady.value
+			}
 		}
 
 		setContent {
-            val isTv = isRunningOnTv()
 			val appUiState by viewModel.uiState.collectAsStateWithLifecycle()
-            val appViewState by viewModel.appViewState.collectAsStateWithLifecycle()
+			val configurationChange by viewModel.configurationChange.collectAsStateWithLifecycle()
-            val tunnelError by viewModel.tunnelManager.errorEvents.collectAsStateWithLifecycle(null)
-
 			val navController = rememberNavController()
-            val backStackEntry by navController.currentBackStackEntryAsState()
-            val navBarState by
-                currentNavBackStackEntryAsNavBarState(
-                    navController,
-                    backStackEntry,
-                    viewModel,
-                    appUiState,
-                    appViewState,
-                )
-            val snackbar = remember { SnackbarHostState() }
-            var showVpnPermissionDialog by remember { mutableStateOf(false) }
-            var vpnPermissionDenied by remember { mutableStateOf(false) }
 
-            val vpnActivity =
+			LaunchedEffect(configurationChange) {
-                rememberLauncherForActivityResult(
+				if (configurationChange) {
-                    ActivityResultContracts.StartActivityForResult(),
-                    onResult = {
-                        if (it.resultCode != RESULT_OK) {
-                            showVpnPermissionDialog = true
-                            vpnPermissionDenied = true
-                        } else {
-                            vpnPermissionDenied = false
-                            showVpnPermissionDialog = false
-                        }
-                    },
-                )
-
-            LaunchedEffect(appUiState.tunnels) {
-                if (!appViewState.isAppReady) {
-                    viewModel.handleEvent(AppEvent.AppReadyCheck(appUiState.tunnels))
-                }
-            }
-
-            val batteryActivity =
-                rememberLauncherForActivityResult(
-                    ActivityResultContracts.StartActivityForResult()
-                ) { _: ActivityResult ->
-                    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) {
 					Intent(this@MainActivity, MainActivity::class.java).also {
 						startActivity(it)
 						exitProcess(0)
 					}
 				}
 			}
-                LaunchedEffect(errorMessage) {
+
-                    errorMessage?.let {
+			LaunchedEffect(Unit) {
-                        snackbar.showSnackbar(it.asString(this@MainActivity))
+				viewModel.getEmitSplitTunnelApps(this@MainActivity)
-                        viewModel.handleEvent(AppEvent.MessageShown)
 			}
+
+			LaunchedEffect(appUiState.autoTunnelActive) {
+				requestAutoTunnelTileServiceUpdate()
 			}
-                LaunchedEffect(popBackStack) {
+
-                    if (popBackStack) {
+			with(appUiState.appSettings) {
-                        navController.popBackStack()
+				LaunchedEffect(isAutoTunnelEnabled) {
-                        viewModel.handleEvent(AppEvent.PopBackStack(false))
+					this@MainActivity.requestAutoTunnelTileServiceUpdate()
-                    }
-                }
-                LaunchedEffect(requestVpnPermission) {
-                    if (requestVpnPermission) {
-                        if (!vpnPermissionDenied) {
-                            vpnActivity.launch(VpnService.prepare(this@MainActivity))
-                        } else {
-                            showVpnPermissionDialog = true
-                        }
-                        viewModel.handleEvent(AppEvent.VpnPermissionRequested)
-                    }
-                }
-                LaunchedEffect(requestBatteryPermission) {
-                    if (requestBatteryPermission) {
-                        batteryActivity.launch(
-                            Intent().apply {
-                                action = Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS
-                                data = "package:${this@MainActivity.packageName}".toUri()
-                            }
-                        )
 				}
+				LaunchedEffect(isShortcutsEnabled) {
+					if (!isShortcutsEnabled) return@LaunchedEffect shortcutManager.removeShortcuts()
+					shortcutManager.addShortcuts()
 				}
 			}
 
-            CompositionLocalProvider(LocalIsAndroidTV provides isTv) {
+			ServiceWorker.start(this)
+
 			CompositionLocalProvider(LocalNavController provides navController) {
-                    WireguardAutoTunnelTheme(theme = appUiState.appState.theme) {
+				SnackbarControllerProvider { host ->
-                        VpnDeniedDialog(
+					WireguardAutoTunnelTheme(theme = appUiState.generalState.theme) {
-                            showVpnPermissionDialog,
-                            onDismiss = {
-                                showVpnPermissionDialog = false
-                                vpnPermissionDenied = false
-                            },
-                        )
-
 						Scaffold(
-                            modifier =
+							contentWindowInsets = WindowInsets(0),
-                                Modifier.pointerInput(Unit) {
-                                    detectTapGestures {
-                                        viewModel.handleEvent(AppEvent.ClearSelectedTunnels)
-                                    }
-                                },
 							snackbarHost = {
-                                SnackbarHost(snackbar) { snackbarData: SnackbarData ->
+								SnackbarHost(host) { snackbarData: SnackbarData ->
 									CustomSnackBar(
 										snackbarData.visuals.message,
 										isRtl = false,
 										containerColor =
-                                            MaterialTheme.colorScheme.surfaceColorAtElevation(2.dp),
+										MaterialTheme.colorScheme.surfaceColorAtElevation(
+											2.dp,
+										),
 									)
 								}
 							},
-                            topBar = { DynamicTopAppBar(navBarState) },
 							bottomBar = {
-                                AnimatedVisibility(
+								BottomNavBar(
-                                    visible = navBarState.showBottom,
+									navController,
-                                    enter = slideInVertically(initialOffsetY = { it }),
+									listOf(
-                                    exit = slideOutVertically(targetOffsetY = { it }),
+										BottomNavItem(
-                                ) {
+											name = stringResource(R.string.tunnels),
-                                    BottomNavbar(appUiState = appUiState)
+											route = Route.Main,
-                                }
+											icon = Icons.Rounded.Home,
+										),
+										BottomNavItem(
+											name = stringResource(R.string.settings),
+											route = Route.Settings,
+											icon = Icons.Rounded.Settings,
+										),
+										BottomNavItem(
+											name = stringResource(R.string.support),
+											route = Route.Support,
+											icon = Icons.Rounded.QuestionMark,
+										),
+									),
+								)
 							},
 						) { padding ->
-                            Box(
+							Box(modifier = Modifier.Companion.fillMaxSize().padding(padding)) {
-                                modifier =
-                                    Modifier.fillMaxSize()
-                                        .background(MaterialTheme.colorScheme.surface)
-                                        .padding(padding)
-                                        .consumeWindowInsets(padding)
-                                        .imePadding()
-                            ) {
 								NavHost(
 									navController,
-                                    startDestination =
+									enterTransition = { fadeIn(tween(Constants.TRANSITION_ANIMATION_TIME)) },
-                                        (if (appUiState.appState.isPinLockEnabled) Route.Lock
+									exitTransition = { fadeOut(tween(Constants.TRANSITION_ANIMATION_TIME)) },
-                                        else Route.Main),
+									startDestination = (if (appUiState.generalState.isPinLockEnabled) Route.Lock else Route.Main),
 								) {
 									composable<Route.Main> {
-                                        MainScreen(appUiState, appViewState, viewModel)
+										MainScreen(
+											uiState = appUiState,
+										)
 									}
 									composable<Route.Settings> {
-                                        SettingsScreen(appUiState, viewModel)
+										SettingsScreen(
-                                    }
+											appViewModel = viewModel,
-                                    composable<Route.SettingsAdvanced> {
+											uiState = appUiState,
-                                        SettingsAdvancedScreen(appUiState, viewModel)
+										)
 									}
 									composable<Route.LocationDisclosure> {
-                                        LocationDisclosureScreen(appUiState, viewModel)
+										LocationDisclosureScreen(viewModel, appUiState)
 									}
 									composable<Route.AutoTunnel> {
-                                        AutoTunnelScreen(appUiState, viewModel)
+										AutoTunnelScreen(
+											appUiState.appSettings,
+										)
+									}
+									composable<Route.Appearance> {
+										AppearanceScreen()
 									}
-                                    composable<Route.Appearance> { AppearanceScreen() }
 									composable<Route.Language> {
 										LanguageScreen(appUiState, viewModel)
 									}
 									composable<Route.Display> {
-                                        DisplayScreen(appUiState, viewModel)
+										DisplayScreen(appUiState)
 									}
 									composable<Route.Support> {
-                                        SupportScreen(appViewModel = viewModel)
+										SupportScreen(appUiState, viewModel)
 									}
-                                    composable<Route.License> { LicenseScreen() }
 									composable<Route.AutoTunnelAdvanced> {
-                                        AutoTunnelAdvancedScreen(appUiState, viewModel)
+										AdvancedScreen(appUiState.appSettings, viewModel)
 									}
-                                    composable<Route.WifiDetectionMethod> {
+									composable<Route.Logs> {
-                                        WifiDetectionMethodScreen(appUiState, viewModel)
+										LogsScreen()
 									}
-                                    composable<Route.Logs> { LogsScreen(appViewState, viewModel) }
+									composable<Route.Config> {
-                                    composable<Route.Config> { backStack ->
+										val args = it.toRoute<Route.Config>()
-                                        val args = backStack.toRoute<Route.Config>()
 										val config =
 											appUiState.tunnels.firstOrNull { it.id == args.id }
 										ConfigScreen(config, viewModel)
 									}
-                                    composable<Route.TunnelOptions> { backStack ->
+									composable<Route.TunnelOptions> {
-                                        val args = backStack.toRoute<Route.TunnelOptions>()
+										val args = it.toRoute<Route.TunnelOptions>()
-                                        appUiState.tunnels
+										val config = appUiState.tunnels.first { it.id == args.id }
-                                            .firstOrNull { it.id == args.id }
+										OptionsScreen(config)
-                                            ?.let { config ->
-                                                TunnelOptionsScreen(config, viewModel, appViewState)
 									}
+									composable<Route.Lock> {
+										PinLockScreen(viewModel)
+									}
+									composable<Route.Scanner> {
+										ScannerScreen()
 									}
-                                    composable<Route.Lock> { PinLockScreen(viewModel) }
 									composable<Route.KillSwitch> {
 										KillSwitchScreen(appUiState, viewModel)
 									}
-                                    composable<Route.SplitTunnel> { SplitTunnelScreen(viewModel) }
+									composable<Route.SplitTunnel> {
-                                    composable<Route.TunnelAutoTunnel> { backStack ->
+										val args = it.toRoute<Route.SplitTunnel>()
-                                        val args = backStack.toRoute<Route.TunnelOptions>()
+										val config = appUiState.tunnels.first { it.id == args.id }
-                                        appUiState.tunnels
+										SplitTunnelScreen(config, viewModel)
-                                            .firstOrNull { it.id == args.id }
+									}
-                                            ?.let {
+									composable<Route.TunnelAutoTunnel> {
-                                                TunnelAutoTunnelScreen(
+										val args = it.toRoute<Route.TunnelOptions>()
-                                                    it,
+										val config = appUiState.tunnels.first { it.id == args.id }
-                                                    appUiState.appSettings,
+										TunnelAutoTunnelScreen(config, appUiState.appSettings)
-                                                    viewModel,
+									}
-                                                )
+								}
+								BackHandler {
+									if (navController.previousBackStackEntry == null || !navController.popBackStack()) {
+										this@MainActivity.finish()
 									}
 								}
 							}
@@ -328,22 +265,3 @@ class MainActivity : AppCompatActivity() {
 		}
 	}
 }
-
-    override fun onResume() {
-        super.onResume()
-        checkPermissionAndNotify()
-    }
-
-    private fun checkPermissionAndNotify() {
-        val hasLocation =
-            ContextCompat.checkSelfPermission(this, Manifest.permission.ACCESS_FINE_LOCATION) ==
-                PackageManager.PERMISSION_GRANTED
-        if (lastLocationPermissionState != hasLocation) {
-            Timber.d("Location permission changed to: $hasLocation")
-            if (hasLocation) {
-                networkMonitor.sendLocationPermissionsGrantedBroadcast()
-            }
-            lastLocationPermissionState = hasLocation
-        }
-    }
-}

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

@@ -11,7 +11,6 @@ import androidx.work.Configuration
 import com.wireguard.android.backend.GoBackend
 import com.zaneschepke.logcatter.LogReader
 import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelManager
-import com.zaneschepke.wireguardautotunnel.core.worker.ServiceWorker
 import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
 import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
 import com.zaneschepke.wireguardautotunnel.di.MainDispatcher
@@ -19,33 +18,46 @@ import com.zaneschepke.wireguardautotunnel.domain.enums.BackendState
 import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
 import com.zaneschepke.wireguardautotunnel.util.LocaleUtil
 import com.zaneschepke.wireguardautotunnel.util.ReleaseTree
+import com.zaneschepke.wireguardautotunnel.util.extensions.isRunningOnTv
 import dagger.hilt.android.HiltAndroidApp
-import javax.inject.Inject
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import timber.log.Timber
+import javax.inject.Inject
 
 @HiltAndroidApp
 class WireGuardAutoTunnel : Application(), Configuration.Provider {
 
-    @Inject lateinit var workerFactory: HiltWorkerFactory
+	@Inject
+	lateinit var workerFactory: HiltWorkerFactory
 
 	override val workManagerConfiguration: Configuration
-        get() = Configuration.Builder().setWorkerFactory(workerFactory).build()
+		get() = Configuration.Builder()
+			.setWorkerFactory(workerFactory)
+			.build()
 
-    @Inject @ApplicationScope lateinit var applicationScope: CoroutineScope
+	@Inject
+	@ApplicationScope
+	lateinit var applicationScope: CoroutineScope
 
-    @Inject lateinit var logReader: LogReader
+	@Inject
+	lateinit var logReader: LogReader
 
-    @Inject lateinit var appDataRepository: AppDataRepository
+	@Inject
+	lateinit var appDataRepository: AppDataRepository
 
-    @Inject @IoDispatcher lateinit var ioDispatcher: CoroutineDispatcher
+	@Inject
+	@IoDispatcher
+	lateinit var ioDispatcher: CoroutineDispatcher
 
-    @Inject @MainDispatcher lateinit var mainDispatcher: CoroutineDispatcher
+	@Inject
+	@MainDispatcher
+	lateinit var mainDispatcher: CoroutineDispatcher
 
-    @Inject lateinit var tunnelManager: TunnelManager
+	@Inject
+	lateinit var tunnelManager: TunnelManager
 
 	override fun onCreate() {
 		super.onCreate()
@@ -59,7 +71,7 @@ class WireGuardAutoTunnel : Application(), Configuration.Provider {
 					.detectDiskWrites()
 					.detectNetwork()
 					.penaltyLog()
-                    .build()
+					.build(),
 			)
 		} else {
 			Timber.plant(ReleaseTree())
@@ -70,28 +82,33 @@ class WireGuardAutoTunnel : Application(), Configuration.Provider {
 				val settings = appDataRepository.settings.get()
 				if (settings.isAlwaysOnVpnEnabled) {
 					val tunnel = appDataRepository.getPrimaryOrFirstTunnel()
-                    tunnel?.let { tunnelManager.startTunnel(it) }
+					tunnel?.let {
+						tunnelManager.startTunnel(it)
+					}
 				} else {
-                    Timber.w("Always-on VPN is not enabled in app settings")
+					Timber.Forest.w("Always-on VPN is not enabled in app settings")
 				}
 			}
 		}
 
-        ServiceWorker.start(this)
-
 		applicationScope.launch {
-            appDataRepository.appState.getLocale()?.let {
+			withContext(mainDispatcher) {
-                withContext(mainDispatcher) { LocaleUtil.changeLocale(it) }
+				if (appDataRepository.appState.isLocalLogsEnabled() && !isRunningOnTv()) logReader.initialize()
+			}
+			if (!appDataRepository.settings.get().isKernelEnabled) {
+				tunnelManager.setBackendState(BackendState.SERVICE_ACTIVE, emptyList())
+			}
+			appDataRepository.appState.getLocale()?.let {
+				withContext(mainDispatcher) {
+					LocaleUtil.changeLocale(it)
 				}
-            appDataRepository.appState.isLocalLogsEnabled().let { enabled ->
-                if (enabled) logReader.start()
 			}
 		}
 	}
 
 	override fun onTerminate() {
 		applicationScope.launch {
-            tunnelManager.setBackendState(BackendState.INACTIVE, emptyList())
+			tunnelManager.setBackendState(BackendState.SERVICE_ACTIVE, emptyList())
 		}
 		super.onTerminate()
 	}
@@ -102,7 +119,6 @@ class WireGuardAutoTunnel : Application(), Configuration.Provider {
 			Timber.d("Application entered foreground")
 			foreground = true
 		}
-
 		override fun onPause(owner: LifecycleOwner) {
 			Timber.d("Application entered background")
 			foreground = false
@@ -116,18 +132,6 @@ class WireGuardAutoTunnel : Application(), Configuration.Provider {
 			return foreground
 		}
 
-        @Volatile private var lastActiveTunnels: List<Int> = emptyList()
-
-        @Synchronized
-        fun getLastActiveTunnels(): List<Int> {
-            return lastActiveTunnels
-        }
-
-        @Synchronized
-        fun setLastActiveTunnels(newTunnels: List<Int>) {
-            lastActiveTunnels = newTunnels
-        }
-
 		lateinit var instance: WireGuardAutoTunnel
 			private set
 	}

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

@@ -0,0 +1,45 @@
+package com.zaneschepke.wireguardautotunnel.core.broadcast
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
+import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
+import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
+import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelManager
+import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+
+@AndroidEntryPoint
+class AppUpdateReceiver : BroadcastReceiver() {
+
+	@Inject
+	@ApplicationScope
+	lateinit var applicationScope: CoroutineScope
+
+	@Inject
+	lateinit var appDataRepository: AppDataRepository
+
+	@Inject
+	lateinit var serviceManager: ServiceManager
+
+	@Inject
+	lateinit var tunnelManager: TunnelManager
+
+	override fun onReceive(context: Context, intent: Intent) {
+		if (intent.action != Intent.ACTION_MY_PACKAGE_REPLACED) return
+		serviceManager.updateTunnelTile()
+		serviceManager.updateAutoTunnelTile()
+		applicationScope.launch {
+			with(appDataRepository.settings.get()) {
+				if (isRestoreOnBootEnabled) {
+					// If auto tunnel is enabled, just start it and let auto tunnel start appropriate tun
+					if (isAutoTunnelEnabled && !serviceManager.autoTunnelActive.value) return@launch serviceManager.startAutoTunnel(true)
+					tunnelManager.restorePreviousState()
+				}
+			}
+		}
+	}
+}

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

@@ -0,0 +1,44 @@
+package com.zaneschepke.wireguardautotunnel.core.broadcast
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
+import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
+import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
+import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelManager
+import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+
+@AndroidEntryPoint
+class BootReceiver : BroadcastReceiver() {
+	@Inject
+	lateinit var appDataRepository: AppDataRepository
+
+	@Inject
+	@ApplicationScope
+	lateinit var applicationScope: CoroutineScope
+
+	@Inject
+	lateinit var serviceManager: ServiceManager
+
+	@Inject
+	lateinit var tunnelManager: TunnelManager
+
+	override fun onReceive(context: Context, intent: Intent) {
+		if (Intent.ACTION_BOOT_COMPLETED != intent.action) return
+		serviceManager.updateTunnelTile()
+		serviceManager.updateAutoTunnelTile()
+		applicationScope.launch {
+			with(appDataRepository.settings.get()) {
+				if (isRestoreOnBootEnabled) {
+					// If auto tunnel is enabled, just start it and let auto tunnel start appropriate tun
+					if (isAutoTunnelEnabled && !serviceManager.autoTunnelActive.value) return@launch serviceManager.startAutoTunnel(true)
+					tunnelManager.restorePreviousState()
+				}
+			}
+		}
+	}
+}

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

@@ -3,33 +3,40 @@ package com.zaneschepke.wireguardautotunnel.core.broadcast
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
+import com.zaneschepke.wireguardautotunnel.domain.repository.TunnelRepository
+import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
 import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
 import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelManager
-import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
-import com.zaneschepke.wireguardautotunnel.domain.repository.TunnelRepository
 import dagger.hilt.android.AndroidEntryPoint
-import javax.inject.Inject
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
+import javax.inject.Inject
 
 @AndroidEntryPoint
 class KernelReceiver : BroadcastReceiver() {
 
-    @Inject @ApplicationScope lateinit var applicationScope: CoroutineScope
+	@Inject
+	@ApplicationScope
+	lateinit var applicationScope: CoroutineScope
 
-    @Inject lateinit var tunnelRepository: TunnelRepository
+	@Inject
+	lateinit var tunnelRepository: TunnelRepository
 
-    @Inject lateinit var serviceManager: ServiceManager
+	@Inject
+	lateinit var serviceManager: ServiceManager
 
-    @Inject lateinit var tunnelManager: TunnelManager
+	@Inject
+	lateinit var tunnelManager: TunnelManager
 
 	override fun onReceive(context: Context, intent: Intent) {
 		val action = intent.action ?: return
 		applicationScope.launch {
 			if (action == REFRESH_TUNNELS_ACTION) {
-                tunnelManager.runningTunnelNames().forEach { name ->
+				tunnelManager.runningTunnelNames().forEach {
-                    val tunnel = tunnelRepository.findByTunnelName(name)
+					val tunnel = tunnelRepository.findByTunnelName(it)
-                    tunnel?.let { tunnelRepository.save(it.copy(isActive = true)) }
+					tunnel?.let {
+						tunnelRepository.save(it.copy(isActive = true))
+					}
 				}
 				serviceManager.updateTunnelTile()
 			}

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

@@ -4,26 +4,31 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import com.zaneschepke.wireguardautotunnel.core.notification.NotificationManager
+import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
 import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
 import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelManager
-import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
 import com.zaneschepke.wireguardautotunnel.domain.enums.NotificationAction
 import com.zaneschepke.wireguardautotunnel.domain.repository.TunnelRepository
 import dagger.hilt.android.AndroidEntryPoint
-import javax.inject.Inject
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
+import javax.inject.Inject
 
 @AndroidEntryPoint
 class NotificationActionReceiver : BroadcastReceiver() {
 
-    @Inject lateinit var serviceManager: ServiceManager
+	@Inject
+	lateinit var serviceManager: ServiceManager
 
-    @Inject lateinit var tunnelManager: TunnelManager
+	@Inject
+	lateinit var tunnelManager: TunnelManager
 
-    @Inject lateinit var tunnelRepository: TunnelRepository
+	@Inject
+	lateinit var tunnelRepository: TunnelRepository
 
-    @Inject @ApplicationScope lateinit var applicationScope: CoroutineScope
+	@Inject
+	@ApplicationScope
+	lateinit var applicationScope: CoroutineScope
 
 	override fun onReceive(context: Context, intent: Intent) {
 		applicationScope.launch {
@@ -31,15 +36,11 @@ class NotificationActionReceiver : BroadcastReceiver() {
 				NotificationAction.AUTO_TUNNEL_OFF.name -> serviceManager.stopAutoTunnel()
 				NotificationAction.TUNNEL_OFF.name -> {
 					val tunnelId = intent.getIntExtra(NotificationManager.EXTRA_ID, 0)
-                    if (tunnelId == STOP_ALL_TUNNELS_ID) return@launch tunnelManager.stopTunnel()
+					if (tunnelId == 0) return@launch tunnelManager.stopTunnel()
 					val tunnel = tunnelRepository.getById(tunnelId)
 					tunnelManager.stopTunnel(tunnel)
 				}
 			}
 		}
 	}
-
-    companion object {
-        const val STOP_ALL_TUNNELS_ID = 0
-    }
 }

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

@@ -1,96 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.core.broadcast
-
-import android.content.BroadcastReceiver
-import android.content.Context
-import android.content.Intent
-import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
-import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelManager
-import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
-import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
-import com.zaneschepke.wireguardautotunnel.util.Constants
-import dagger.hilt.android.AndroidEntryPoint
-import javax.inject.Inject
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.launch
-import timber.log.Timber
-
-@AndroidEntryPoint
-class RemoteControlReceiver : BroadcastReceiver() {
-
-    @Inject @ApplicationScope lateinit var applicationScope: CoroutineScope
-
-    @Inject lateinit var appDataRepository: AppDataRepository
-
-    @Inject lateinit var serviceManager: ServiceManager
-
-    @Inject lateinit var tunnelManager: TunnelManager
-
-    enum class Action(private val suffix: String) {
-        START_TUNNEL("START_TUNNEL"),
-        STOP_TUNNEL("STOP_TUNNEL"),
-        START_AUTO_TUNNEL("START_AUTO_TUNNEL"),
-        STOP_AUTO_TUNNEL("STOP_AUTO_TUNNEL");
-
-        fun getFullAction(): String {
-            return "${Constants.BASE_PACKAGE}.$suffix"
-        }
-
-        companion object {
-            fun fromAction(action: String): Action? {
-                for (a in entries) {
-                    if (a.getFullAction() == action) {
-                        return a
-                    }
-                }
-                return null
-            }
-        }
-    }
-
-    override fun onReceive(context: Context, intent: Intent) {
-        Timber.i("onReceive")
-        val action = intent.action ?: return
-        val appAction = Action.fromAction(action) ?: return Timber.w("Unknown action $action")
-        applicationScope.launch {
-            if (!appDataRepository.appState.isRemoteControlEnabled())
-                return@launch Timber.w("Remote control disabled")
-            val key =
-                appDataRepository.appState.getRemoteKey()
-                    ?: return@launch Timber.w("Remote control key missing")
-            if (key != intent.getStringExtra(EXTRA_KEY)?.trim())
-                return@launch Timber.w("Invalid remote control key")
-            when (appAction) {
-                Action.START_TUNNEL -> {
-                    val tunnelName =
-                        intent.getStringExtra(EXTRA_TUN_NAME) ?: return@launch startDefaultTunnel()
-                    val tunnel =
-                        appDataRepository.tunnels.findByTunnelName(tunnelName)
-                            ?: return@launch startDefaultTunnel()
-                    tunnelManager.startTunnel(tunnel)
-                }
-                Action.STOP_TUNNEL -> {
-                    val tunnelName =
-                        intent.getStringExtra(EXTRA_TUN_NAME)
-                            ?: return@launch tunnelManager.stopTunnel()
-                    val tunnel =
-                        appDataRepository.tunnels.findByTunnelName(tunnelName)
-                            ?: return@launch tunnelManager.stopTunnel()
-                    tunnelManager.stopTunnel(tunnel)
-                }
-                Action.START_AUTO_TUNNEL -> serviceManager.startAutoTunnel()
-                Action.STOP_AUTO_TUNNEL -> serviceManager.stopAutoTunnel()
-            }
-        }
-    }
-
-    private suspend fun startDefaultTunnel() {
-        appDataRepository.getPrimaryOrFirstTunnel()?.let { tunnel ->
-            tunnelManager.startTunnel(tunnel)
-        }
-    }
-
-    companion object {
-        const val EXTRA_TUN_NAME = "tunnelName"
-        const val EXTRA_KEY = "key"
-    }
-}

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

@@ -1,55 +0,0 @@
-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 dagger.hilt.android.AndroidEntryPoint
-import javax.inject.Inject
-import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.launch
-import timber.log.Timber
-
-@AndroidEntryPoint
-class RestartReceiver : BroadcastReceiver() {
-    @Inject lateinit var appDataRepository: AppDataRepository
-
-    @Inject @ApplicationScope lateinit var applicationScope: CoroutineScope
-
-    @Inject lateinit var serviceManager: ServiceManager
-
-    @Inject lateinit var tunnelManager: TunnelManager
-
-    @Inject lateinit var logReader: LogReader
-
-    @Inject @IoDispatcher lateinit var ioDispatcher: CoroutineDispatcher
-
-    override fun onReceive(context: Context, intent: Intent) {
-        Timber.d("RestartReceiver triggered with action: ${intent.action}")
-        serviceManager.updateTunnelTile()
-        serviceManager.updateAutoTunnelTile()
-        applicationScope.launch(ioDispatcher) {
-            val settings = appDataRepository.settings.get()
-            if (settings.isRestoreOnBootEnabled) {
-                if (
-                    settings.isAutoTunnelEnabled && serviceManager.autoTunnelService.value == null
-                ) {
-                    Timber.d("Starting auto-tunnel on boot/update")
-                    serviceManager.startAutoTunnel()
-                } else {
-                    Timber.d("Restoring previous tunnel state")
-                    tunnelManager.restorePreviousState()
-                }
-            } else {
-                Timber.d("Restore on boot disabled, skipping")
-            }
-            if (intent.action == Intent.ACTION_MY_PACKAGE_REPLACED) logReader.deleteAndClearLogs()
-        }
-    }
-}

app/src/main/java/com/zaneschepke/wireguardautotunnel/core/network/InternetConnectivityMonitor.kt

@@ -0,0 +1,161 @@
+package com.zaneschepke.wireguardautotunnel.core.network
+
+import android.content.Context
+import android.net.ConnectivityManager
+import android.net.Network
+import android.net.NetworkCapabilities
+import android.net.NetworkRequest
+import android.net.wifi.SupplicantState
+import android.net.wifi.WifiManager
+import android.os.Build
+import com.zaneschepke.wireguardautotunnel.domain.state.ConnectivityState
+import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
+import dagger.hilt.android.qualifiers.ApplicationContext
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.channels.awaitClose
+import kotlinx.coroutines.flow.callbackFlow
+import kotlinx.coroutines.flow.flowOn
+import javax.inject.Inject
+
+class InternetConnectivityMonitor
+@Inject
+constructor(
+	@ApplicationContext private val context: Context,
+	@IoDispatcher private val ioDispatcher: CoroutineDispatcher,
+) : NetworkMonitor {
+
+	private val connectivityManager =
+		context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
+
+	@get:Synchronized @set:Synchronized
+	private var wifiCapabilities: NetworkCapabilities? = null
+
+	@get:Synchronized @set:Synchronized
+	private var wifiNetworkChanged: Boolean = false
+
+	override val didWifiChangeSinceLastCapabilitiesQuery: Boolean
+		get() = wifiNetworkChanged
+
+	override val status = callbackFlow {
+
+		var wifiState: Boolean = false
+		var ethernetState: Boolean = false
+		var cellularState: Boolean = false
+
+		fun emitState() {
+			trySend(ConnectivityState(wifiState, ethernetState, cellularState))
+		}
+
+		val currentNetwork = connectivityManager.activeNetwork
+		if (currentNetwork == null) {
+			emitState()
+		}
+
+		fun updateCapabilityState(up: Boolean, network: Network) {
+			with(connectivityManager.getNetworkCapabilities(network)) {
+				when {
+					this == null -> return
+					hasTransport(NetworkCapabilities.TRANSPORT_WIFI) -> wifiState = up
+					hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR) ->
+						cellularState = up
+
+					hasTransport(NetworkCapabilities.TRANSPORT_ETHERNET) ->
+						ethernetState = up
+				}
+			}
+		}
+
+		fun onWifiChange(network: Network, callback: () -> Unit) {
+			if (connectivityManager.getNetworkCapabilities(network)?.hasTransport(NetworkCapabilities.TRANSPORT_WIFI) == true) {
+				callback()
+			}
+		}
+
+		fun onAvailable(network: Network) {
+			onWifiChange(network) {
+				wifiNetworkChanged = true
+			}
+		}
+
+		fun onCapabilitiesChanged(network: Network, networkCapabilities: NetworkCapabilities) {
+			onWifiChange(network) {
+				wifiCapabilities = networkCapabilities
+			}
+			updateCapabilityState(true, network)
+			emitState()
+		}
+
+		val networkStatusCallback =
+			when (Build.VERSION.SDK_INT) {
+				in Build.VERSION_CODES.S..Int.MAX_VALUE -> {
+					object :
+						ConnectivityManager.NetworkCallback(
+							FLAG_INCLUDE_LOCATION_INFO,
+						) {
+						override fun onAvailable(network: Network) {
+							onAvailable(network)
+						}
+
+						override fun onLost(network: Network) {
+							updateCapabilityState(false, network)
+							emitState()
+						}
+
+						override fun onCapabilitiesChanged(network: Network, networkCapabilities: NetworkCapabilities) {
+							onCapabilitiesChanged(network, networkCapabilities)
+						}
+					}
+				}
+
+				else -> {
+					object : ConnectivityManager.NetworkCallback() {
+						override fun onAvailable(network: Network) {
+							onAvailable(network)
+						}
+
+						override fun onLost(network: Network) {
+							updateCapabilityState(false, network)
+							emitState()
+						}
+
+						override fun onCapabilitiesChanged(network: Network, networkCapabilities: NetworkCapabilities) {
+							onCapabilitiesChanged(network, networkCapabilities)
+						}
+					}
+				}
+			}
+		val request =
+			NetworkRequest.Builder()
+				.addTransportType(NetworkCapabilities.TRANSPORT_WIFI)
+				.addTransportType(NetworkCapabilities.TRANSPORT_ETHERNET)
+				.addTransportType(NetworkCapabilities.TRANSPORT_CELLULAR)
+				.addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
+				.addCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED)
+				.build()
+		connectivityManager.registerNetworkCallback(request, networkStatusCallback)
+
+		awaitClose { connectivityManager.unregisterNetworkCallback(networkStatusCallback) }
+	}.flowOn(ioDispatcher)
+
+	override fun getWifiCapabilities(): NetworkCapabilities? {
+		wifiNetworkChanged = false
+		return wifiCapabilities
+	}
+
+	companion object {
+		fun getNetworkName(networkCapabilities: NetworkCapabilities, context: Context): String? {
+			var ssid = networkCapabilities.getWifiName()
+			if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.S) {
+				val wifiManager =
+					context.applicationContext.getSystemService(Context.WIFI_SERVICE) as WifiManager
+
+				@Suppress("DEPRECATION")
+				val info = wifiManager.connectionInfo
+				if (info.supplicantState === SupplicantState.COMPLETED) {
+					ssid = info.ssid
+				}
+			}
+			return ssid?.trim('"')
+		}
+	}
+}

app/src/main/java/com/zaneschepke/wireguardautotunnel/core/network/NetworkExtensions.kt

@@ -0,0 +1,16 @@
+package com.zaneschepke.wireguardautotunnel.core.network
+
+import android.net.NetworkCapabilities
+import android.net.wifi.WifiInfo
+import android.os.Build
+
+fun NetworkCapabilities.getWifiName(): String? {
+	if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+		val info: WifiInfo
+		if (transportInfo is WifiInfo) {
+			info = transportInfo as WifiInfo
+			return info.ssid
+		}
+	}
+	return null
+}

app/src/main/java/com/zaneschepke/wireguardautotunnel/core/network/NetworkMonitor.kt

@@ -0,0 +1,13 @@
+package com.zaneschepke.wireguardautotunnel.core.network
+
+import android.net.NetworkCapabilities
+import com.zaneschepke.wireguardautotunnel.domain.state.ConnectivityState
+import kotlinx.coroutines.flow.Flow
+
+interface NetworkMonitor {
+	val status: Flow<ConnectivityState>
+
+	// util to help limit location queries
+	val didWifiChangeSinceLastCapabilitiesQuery: Boolean
+	fun getWifiCapabilities(): NetworkCapabilities?
+}

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

@@ -4,13 +4,12 @@ import android.app.Notification
 import android.app.NotificationManager
 import android.content.Context
 import androidx.core.app.NotificationCompat
-import com.zaneschepke.wireguardautotunnel.core.notification.WireGuardNotification.NotificationChannels
 import com.zaneschepke.wireguardautotunnel.domain.enums.NotificationAction
+import com.zaneschepke.wireguardautotunnel.core.notification.WireGuardNotification.NotificationChannels
 import com.zaneschepke.wireguardautotunnel.util.StringValue
 
 interface NotificationManager {
 	val context: Context
-
 	fun createNotification(
 		channel: NotificationChannels,
 		title: String = "",
@@ -33,16 +32,14 @@ interface NotificationManager {
 		onlyAlertOnce: Boolean = true,
 	): Notification
 
-    fun createNotificationAction(
+	fun createNotificationAction(notificationAction: NotificationAction, extraId: Int? = null): NotificationCompat.Action
-        notificationAction: NotificationAction,
-        extraId: Int? = null,
-    ): NotificationCompat.Action
 
 	fun remove(notificationId: Int)
 
 	fun show(notificationId: Int, notification: Notification)
 
 	companion object {
+		const val KERNEL_SERVICE_NOTIFICATION_ID = 123
 		const val AUTO_TUNNEL_NOTIFICATION_ID = 122
 		const val VPN_NOTIFICATION_ID = 100
 		const val EXTRA_ID = "id"

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

@@ -12,17 +12,20 @@ import android.graphics.Color
 import androidx.core.app.ActivityCompat
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
-import com.zaneschepke.wireguardautotunnel.MainActivity
 import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.core.broadcast.NotificationActionReceiver
+import com.zaneschepke.wireguardautotunnel.MainActivity
 import com.zaneschepke.wireguardautotunnel.core.notification.NotificationManager.Companion.EXTRA_ID
 import com.zaneschepke.wireguardautotunnel.domain.enums.NotificationAction
 import com.zaneschepke.wireguardautotunnel.util.StringValue
 import dagger.hilt.android.qualifiers.ApplicationContext
 import javax.inject.Inject
 
-class WireGuardNotification @Inject constructor(@ApplicationContext override val context: Context) :
+class WireGuardNotification
-    com.zaneschepke.wireguardautotunnel.core.notification.NotificationManager {
+@Inject
+constructor(
+	@ApplicationContext override val context: Context,
+) : com.zaneschepke.wireguardautotunnel.core.notification.NotificationManager {
 
 	enum class NotificationChannels {
 		VPN,
@@ -42,10 +45,10 @@ class WireGuardNotification @Inject constructor(@ApplicationContext override val
 		onlyAlertOnce: Boolean,
 	): Notification {
 		notificationManager.createNotificationChannel(channel.asChannel())
-        return channel
+		return channel.asBuilder().apply {
-            .asBuilder()
+			actions.forEach {
-            .apply {
+				addAction(it)
-                actions.forEach { addAction(it) }
+			}
 			setContentTitle(title)
 			setContentIntent(
 				PendingIntent.getActivity(
@@ -53,16 +56,15 @@ class WireGuardNotification @Inject constructor(@ApplicationContext override val
 					0,
 					Intent(context, MainActivity::class.java),
 					PendingIntent.FLAG_IMMUTABLE,
-                    )
+				),
 			)
 			setContentText(description)
 			setOnlyAlertOnce(onlyAlertOnce)
 			setOngoing(onGoing)
 			setPriority(NotificationCompat.PRIORITY_HIGH)
 			setShowWhen(showTimestamp)
-                setSmallIcon(R.drawable.ic_notification)
+			setSmallIcon(R.drawable.ic_launcher)
-            }
+		}.build()
-            .build()
 	}
 
 	override fun createNotification(
@@ -87,12 +89,8 @@ class WireGuardNotification @Inject constructor(@ApplicationContext override val
 		)
 	}
 
-    override fun createNotificationAction(
+	override fun createNotificationAction(notificationAction: NotificationAction, extraId: Int?): NotificationCompat.Action {
-        notificationAction: NotificationAction,
+		val pendingIntent = PendingIntent.getBroadcast(
-        extraId: Int?,
-    ): NotificationCompat.Action {
-        val pendingIntent =
-            PendingIntent.getBroadcast(
 			context,
 			0,
 			Intent(context, NotificationActionReceiver::class.java).apply {
@@ -102,11 +100,10 @@ class WireGuardNotification @Inject constructor(@ApplicationContext override val
 			PendingIntent.FLAG_IMMUTABLE,
 		)
 		return NotificationCompat.Action.Builder(
-                R.drawable.ic_notification,
+			R.drawable.ic_launcher,
 			notificationAction.title(context).uppercase(),
 			pendingIntent,
-            )
+		).build()
-            .build()
 	}
 
 	override fun remove(notificationId: Int) {
@@ -115,12 +112,7 @@ class WireGuardNotification @Inject constructor(@ApplicationContext override val
 
 	override fun show(notificationId: Int, notification: Notification) {
 		with(notificationManager) {
-            if (
+			if (ActivityCompat.checkSelfPermission(context, Manifest.permission.POST_NOTIFICATIONS) != PackageManager.PERMISSION_GRANTED) {
-                ActivityCompat.checkSelfPermission(
-                    context,
-                    Manifest.permission.POST_NOTIFICATIONS,
-                ) != PackageManager.PERMISSION_GRANTED
-            ) {
 				return
 			}
 			notify(notificationId, notification)
@@ -136,7 +128,10 @@ class WireGuardNotification @Inject constructor(@ApplicationContext override val
 				)
 			}
 			NotificationChannels.VPN -> {
-                NotificationCompat.Builder(context, context.getString(R.string.vpn_channel_id))
+				NotificationCompat.Builder(
+					context,
+					context.getString(R.string.vpn_channel_id),
+				)
 			}
 		}
 	}
@@ -148,8 +143,7 @@ class WireGuardNotification @Inject constructor(@ApplicationContext override val
 					context.getString(R.string.vpn_channel_id),
 					context.getString(R.string.vpn_channel_name),
 					NotificationManager.IMPORTANCE_HIGH,
-                    )
+				).apply {
-                    .apply {
 					description = context.getString(R.string.vpn_channel_description)
 					enableLights(true)
 					lightColor = Color.WHITE
@@ -162,8 +156,7 @@ class WireGuardNotification @Inject constructor(@ApplicationContext override val
 					context.getString(R.string.auto_tunnel_channel_id),
 					context.getString(R.string.auto_tunnel_channel_name),
 					NotificationManager.IMPORTANCE_HIGH,
-                    )
+				).apply {
-                    .apply {
 					description = context.getString(R.string.auto_tunnel_channel_description)
 					enableLights(true)
 					lightColor = Color.WHITE

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

@@ -1,150 +1,119 @@
 package com.zaneschepke.wireguardautotunnel.core.service
 
-import android.content.ComponentName
+import android.app.Service
 import android.content.Context
 import android.content.Intent
-import android.content.ServiceConnection
-import android.net.VpnService
-import android.os.IBinder
-import com.zaneschepke.wireguardautotunnel.core.service.autotunnel.AutoTunnelService
-import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
-import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
-import com.zaneschepke.wireguardautotunnel.di.MainDispatcher
 import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
+import com.zaneschepke.wireguardautotunnel.core.service.autotunnel.AutoTunnelService
+import com.zaneschepke.wireguardautotunnel.core.service.tile.AutoTunnelControlTile
+import com.zaneschepke.wireguardautotunnel.core.service.tile.TunnelControlTile
+import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
 import com.zaneschepke.wireguardautotunnel.util.extensions.requestAutoTunnelTileServiceUpdate
 import com.zaneschepke.wireguardautotunnel.util.extensions.requestTunnelTileServiceStateUpdate
 import jakarta.inject.Inject
+import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.update
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.sync.Mutex
-import kotlinx.coroutines.sync.withLock
 import kotlinx.coroutines.withContext
 import timber.log.Timber
 
+@OptIn(ExperimentalCoroutinesApi::class)
 class ServiceManager
-@Inject
+@Inject constructor(private val context: Context, private val ioDispatcher: CoroutineDispatcher, private val appDataRepository: AppDataRepository) {
-constructor(
-    private val context: Context,
-    @IoDispatcher private val ioDispatcher: CoroutineDispatcher,
-    @ApplicationScope private val applicationScope: CoroutineScope,
-    @MainDispatcher private val mainDispatcher: CoroutineDispatcher,
-    private val appDataRepository: AppDataRepository,
-) {
 
-    private val autoTunnelMutex = Mutex()
+	private val _autoTunnelActive = MutableStateFlow(false)
 
-    private val _tunnelService = MutableStateFlow<TunnelForegroundService?>(null)
+	val autoTunnelActive = _autoTunnelActive.asStateFlow()
-    private val _autoTunnelService = MutableStateFlow<AutoTunnelService?>(null)
-    val autoTunnelService = _autoTunnelService.asStateFlow()
 
-    private val tunnelServiceConnection =
+	var autoTunnelService = CompletableDeferred<AutoTunnelService>()
-        object : ServiceConnection {
+	var backgroundService = CompletableDeferred<TunnelForegroundService>()
-            override fun onServiceConnected(name: ComponentName, service: IBinder) {
+	var autoTunnelTile = CompletableDeferred<AutoTunnelControlTile>()
-                val binder = service as? TunnelForegroundService.LocalBinder
+	var tunnelControlTile = CompletableDeferred<TunnelControlTile>()
-                _tunnelService.value = binder?.service
+
-                Timber.d("TunnelForegroundService connected")
+	private fun <T : Service> startService(cls: Class<T>, background: Boolean) {
+		runCatching {
+			val intent = Intent(context, cls)
+			if (background) {
+				context.startForegroundService(intent)
+			} else {
+				context.startService(intent)
+			}
+		}.onFailure { Timber.e(it) }
 	}
 
-            override fun onServiceDisconnected(name: ComponentName) {
+	suspend fun startAutoTunnel(background: Boolean) {
-                _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
-    }
-
-    suspend fun startAutoTunnel() {
-        autoTunnelMutex.withLock {
 		val settings = appDataRepository.settings.get()
 		appDataRepository.settings.save(settings.copy(isAutoTunnelEnabled = true))
-            if (_autoTunnelService.value != null) return
+		if (autoTunnelService.isCompleted) return _autoTunnelActive.update { true }
+		runCatching {
+			startService(AutoTunnelService::class.java, background)
+			autoTunnelService.await()
+			autoTunnelService.getCompleted().start()
+			_autoTunnelActive.update { true }
+			updateAutoTunnelTile()
+		}.onFailure {
+			Timber.e(it)
+		}
+	}
+
+	suspend fun startBackgroundService(tunnelConf: TunnelConf) {
+		if (backgroundService.isCompleted) return
+		runCatching {
+			startService(TunnelForegroundService::class.java, true)
+			backgroundService.await()
+			backgroundService.getCompleted().start(tunnelConf)
+		}.onFailure {
+			Timber.e(it)
+		}
+	}
+
+	fun stopBackgroundService() {
+		if (!backgroundService.isCompleted) return
+		runCatching {
+			backgroundService.getCompleted().stop()
+		}.onFailure {
+			Timber.e(it)
+		}
+	}
+
+	suspend fun toggleAutoTunnel(background: Boolean) {
 		withContext(ioDispatcher) {
-                val intent = Intent(context, AutoTunnelService::class.java)
+			if (_autoTunnelActive.value) return@withContext stopAutoTunnel()
-                context.startForegroundService(intent)
+			startAutoTunnel(background)
-                context.bindService(intent, autoTunnelServiceConnection, Context.BIND_AUTO_CREATE)
-                withContext(mainDispatcher) { updateAutoTunnelTile() }
-            }
-        }
-    }
-
-    suspend fun stopAutoTunnel() {
-        autoTunnelMutex.withLock {
-            val settings = appDataRepository.settings.get()
-            appDataRepository.settings.save(settings.copy(isAutoTunnelEnabled = false))
-            if (_autoTunnelService.value == null) return
-            _autoTunnelService.value?.let { service ->
-                service.stop()
-                try {
-                    context.unbindService(autoTunnelServiceConnection)
-                } finally {
-                    _tunnelService.value = null
-                }
-            }
-            withContext(mainDispatcher) { updateAutoTunnelTile() }
-        }
-    }
-
-    suspend fun startTunnelForegroundService() {
-        if (_tunnelService.value != null) return
-        withContext(ioDispatcher) {
-            applicationScope.launch(ioDispatcher) {
-                val intent = Intent(context, TunnelForegroundService::class.java)
-                context.startForegroundService(intent)
-                context.bindService(intent, tunnelServiceConnection, Context.BIND_AUTO_CREATE)
-            }
-        }
-    }
-
-    fun stopTunnelForegroundService() {
-        _tunnelService.value?.let { service ->
-            service.stop()
-            try {
-                context.unbindService(tunnelServiceConnection)
-            } finally {
-                _tunnelService.value = null
-            }
-        }
-    }
-
-    fun toggleAutoTunnel() {
-        applicationScope.launch(ioDispatcher) {
-            if (_autoTunnelService.value != null) stopAutoTunnel() else startAutoTunnel()
 		}
 	}
 
 	fun updateAutoTunnelTile() {
+		if (autoTunnelTile.isCompleted) {
+			autoTunnelTile.getCompleted().updateTileState()
+		} else {
 			context.requestAutoTunnelTileServiceUpdate()
 		}
+	}
 
 	fun updateTunnelTile() {
+		if (tunnelControlTile.isCompleted) {
+			tunnelControlTile.getCompleted().updateTileState()
+		} else {
 			context.requestTunnelTileServiceStateUpdate()
 		}
-
-    fun handleTunnelServiceDestroy() {
-        _tunnelService.update { null }
 	}
 
-    fun handleAutoTunnelServiceDestroy() {
+	suspend fun stopAutoTunnel() {
-        _autoTunnelService.update { null }
+		withContext(ioDispatcher) {
+			val settings = appDataRepository.settings.get()
+			appDataRepository.settings.save(settings.copy(isAutoTunnelEnabled = false))
+			if (!autoTunnelService.isCompleted) return@withContext
+			runCatching {
+				autoTunnelService.getCompleted().stop()
+				_autoTunnelActive.update { false }
+				updateAutoTunnelTile()
+			}.onFailure {
+				Timber.e(it)
+			}
+		}
 	}
 }

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

@@ -2,327 +2,70 @@ package com.zaneschepke.wireguardautotunnel.core.service
 
 import android.app.Notification
 import android.content.Intent
-import android.os.Binder
 import android.os.IBinder
 import androidx.core.app.ServiceCompat
 import androidx.lifecycle.LifecycleService
-import androidx.lifecycle.lifecycleScope
-import com.zaneschepke.networkmonitor.NetworkMonitor
-import com.zaneschepke.networkmonitor.NetworkStatus
 import com.zaneschepke.wireguardautotunnel.R
+import com.zaneschepke.wireguardautotunnel.domain.enums.NotificationAction
 import com.zaneschepke.wireguardautotunnel.core.notification.NotificationManager
 import com.zaneschepke.wireguardautotunnel.core.notification.WireGuardNotification
-import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelManager
+import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
-import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
-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
-import com.zaneschepke.wireguardautotunnel.util.extensions.distinctByKeys
 import dagger.hilt.android.AndroidEntryPoint
-import java.util.concurrent.ConcurrentHashMap
+import kotlinx.coroutines.CompletableDeferred
 import javax.inject.Inject
-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.sync.Mutex
-import kotlinx.coroutines.sync.withLock
-import kotlinx.coroutines.withContext
-import timber.log.Timber
 
 @AndroidEntryPoint
 class TunnelForegroundService : LifecycleService() {
 
-    @Inject lateinit var notificationManager: NotificationManager
+	@Inject
+	lateinit var notificationManager: NotificationManager
 
-    @Inject lateinit var serviceManager: ServiceManager
+	@Inject
-
+	lateinit var serviceManager: ServiceManager
-    @Inject lateinit var networkMonitor: NetworkMonitor
-
-    @Inject @IoDispatcher lateinit var ioDispatcher: CoroutineDispatcher
-
-    @Inject lateinit var tunnelRepo: TunnelRepository
-
-    @Inject lateinit var tunnelManager: TunnelManager
-
-    private val isNetworkConnected = MutableStateFlow(true)
-
-    private val tunnelJobs = ConcurrentHashMap<TunnelConf, Job>()
-    private val pingJobs = ConcurrentHashMap<TunnelConf, Job>()
-
-    private val jobsMutex = Mutex()
-
-    class LocalBinder(val service: TunnelForegroundService) : Binder()
-
-    private val binder = LocalBinder(this)
 
 	override fun onCreate() {
 		super.onCreate()
-        ServiceCompat.startForeground(
+		serviceManager.backgroundService.complete(this)
-            this@TunnelForegroundService,
-            NotificationManager.VPN_NOTIFICATION_ID,
-            onCreateNotification(),
-            Constants.SYSTEM_EXEMPT_SERVICE_TYPE_ID,
-        )
 	}
 
-    override fun onBind(intent: Intent): IBinder {
+	override fun onBind(intent: Intent): IBinder? {
 		super.onBind(intent)
-        return binder
+		return null
 	}
 
 	override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
 		super.onStartCommand(intent, flags, startId)
+		serviceManager.backgroundService.complete(this)
+		return START_NOT_STICKY
+	}
+
+	fun start(tunnelConf: TunnelConf) {
 		ServiceCompat.startForeground(
 			this@TunnelForegroundService,
-            NotificationManager.VPN_NOTIFICATION_ID,
+			NotificationManager.KERNEL_SERVICE_NOTIFICATION_ID,
-            onCreateNotification(),
+			createNotification(tunnelConf),
 			Constants.SYSTEM_EXEMPT_SERVICE_TYPE_ID,
 		)
-        start()
-        return START_STICKY
-    }
-
-    fun start() =
-        lifecycleScope.launch(ioDispatcher) {
-            tunnelManager.activeTunnels.distinctByKeys().collect { activeTunnels ->
-                // No active tunnels and no jobs: nothing to do
-                if (activeTunnels.isEmpty() && tunnelJobs.isEmpty()) return@collect
-
-                // Synchronize jobs with active tunnels
-                synchronizeJobs(activeTunnels)
-                updateServiceNotification()
-            }
-        }
-
-    private suspend fun synchronizeJobs(activeTunnels: Map<TunnelConf, TunnelState>) {
-        jobsMutex.withLock {
-            // Stop jobs for tunnels that are no longer active
-            stopInactiveJobs(activeTunnels)
-            // Start jobs for new tunnels
-            startNewJobs(activeTunnels)
-        }
-    }
-
-    private fun stopInactiveJobs(activeTunnels: Map<TunnelConf, TunnelState>) {
-        // If no active tunnels, clear all jobs
-        if (activeTunnels.isEmpty()) {
-            clearAllJobs()
-            return
-        }
-        // Stop jobs for tunnels not in activeTunnels
-        val tunnelsToStop = tunnelJobs.keys - activeTunnels.keys
-        tunnelsToStop.forEach { tun -> stopTunnelJobs(tun) }
-    }
-
-    private fun clearAllJobs() {
-        tunnelJobs.forEach { (tun, job) ->
-            Timber.d("Stopping tunnel job for ${tun.tunName}")
-            job.cancel()
-        }
-        tunnelJobs.clear()
-
-        pingJobs.forEach { (tun, job) ->
-            if (isPingBounce(tun)) {
-                Timber.d("Preserving ping job for ${tun.tunName} due to PING bounce")
-                return@forEach
-            }
-            Timber.d("Stopping ping job for ${tun.tunName}")
-            job.cancel()
-        }
-        pingJobs.entries.removeIf { (tun, _) -> !isPingBounce(tun) }
-    }
-
-    private fun stopTunnelJobs(tun: TunnelConf) {
-        tunnelJobs.remove(tun)?.cancel()
-        Timber.d("Stopped tunnel job for ${tun.tunName}")
-        if (isPingBounce(tun))
-            return Timber.d("Preserving ${tun.tunName} ping job due to ping bounce")
-        pingJobs.remove(tun)?.cancel()
-        Timber.d("Stopped ping job for ${tun.tunName}")
-    }
-
-    private fun startNewJobs(activeTunnels: Map<TunnelConf, TunnelState>) {
-        val tunnelsToStart = activeTunnels.keys - tunnelJobs.keys
-        tunnelsToStart.forEach { tun ->
-            tunnelJobs[tun] = startTunnelJobs(tun)
-            Timber.d("Started tunnel job for ${tun.tunName}")
-
-            if (pingJobs[tun]?.isActive == true) {
-                Timber.d("Reusing active ping job for ${tun.tunName}")
-            } else {
-                pingJobs[tun]?.cancel() // Cancel any stale job
-                if (tun.isPingEnabled) {
-                    if (tun.isStaticallyConfigured()) {
-                        Timber.d("Skipping ping for statically configured tunnel")
-                    } else {
-                        pingJobs[tun] = startPingJob(tun)
-                        Timber.d("Started ping job for ${tun.tunName}")
-                    }
-                }
-            }
-        }
-    }
-
-    private fun isPingBounce(tun: TunnelConf): Boolean =
-        tunnelManager.bouncingTunnelIds[tun.id] == TunnelStatus.StopReason.PING
-
-    // TODO Would be cool to have this include kill switch
-    // TODO also we need to include errors
-    private fun updateServiceNotification() {
-        val notification =
-            when (tunnelJobs.size) {
-                0 -> onCreateNotification()
-                1 -> createTunnelNotification(tunnelJobs.keys.first())
-                else -> createTunnelsNotification()
-            }
-        ServiceCompat.startForeground(
-            this@TunnelForegroundService,
-            NotificationManager.VPN_NOTIFICATION_ID,
-            notification,
-            Constants.SYSTEM_EXEMPT_SERVICE_TYPE_ID,
-        )
-    }
-
-    // use same scope so we can cancel all of these
-    private fun startTunnelJobs(tunnelConf: TunnelConf) =
-        lifecycleScope.launch(ioDispatcher) {
-            // monitor if we have internet connectivity
-            launch { startNetworkMonitorJob() }
-            // job to trigger stats emit on interval
-            launch { startTunnelStatsJob(tunnelConf) }
-            // monitor changes to the tunnel config
-            launch { startTunnelConfChangesJob(tunnelConf) }
-        }
-
-    private suspend fun startTunnelConfChangesJob(tunnelConf: TunnelConf) {
-        tunnelRepo.flow
-            .flowOn(ioDispatcher)
-            .map { storedTunnels -> storedTunnels.firstOrNull { it.id == tunnelConf.id } }
-            .filterNotNull()
-            // only emit when one of these 3 values change
-            .distinctUntilChanged { old, new -> old == new }
-            .collect { storedTunnel ->
-                if (tunnelConf != storedTunnel) {
-                    Timber.d("Config changed for ${storedTunnel.tunName}, bouncing")
-                    // let this complete, even after cancel
-                    withContext(NonCancellable) {
-                        tunnelManager.bounceTunnel(
-                            storedTunnel,
-                            TunnelStatus.StopReason.CONFIG_CHANGED,
-                        )
-                    }
-                }
-            }
-    }
-
-    private suspend fun startNetworkMonitorJob() {
-        networkMonitor.networkStatusFlow.flowOn(ioDispatcher).collectLatest { status ->
-            val isAvailable = status !is NetworkStatus.Disconnected
-            isNetworkConnected.value = isAvailable
-            Timber.d("Network available: $status")
-        }
-    }
-
-    private suspend fun startTunnelStatsJob(tunnel: TunnelConf) = coroutineScope {
-        while (isActive) {
-            tunnelManager.updateTunnelStatistics(tunnel)
-            delay(STATS_DELAY)
-        }
-    }
-
-    private fun startPingJob(tunnel: TunnelConf) =
-        lifecycleScope.launch(ioDispatcher) {
-            // delay for initial duration
-            delay(tunnel.pingInterval ?: Constants.PING_INTERVAL)
-            while (isActive) {
-                val shouldBounce = shouldBounceTunnel(tunnel)
-                val delayMs =
-                    if (shouldBounce) {
-                        // let this complete, even after cancel
-                        withContext(NonCancellable) {
-                            tunnelManager.bounceTunnel(tunnel, TunnelStatus.StopReason.PING)
-                        }
-                        tunnel.pingCooldown ?: Constants.PING_COOLDOWN
-                    } else {
-                        tunnel.pingInterval ?: Constants.PING_INTERVAL
-                    }
-                delay(delayMs)
-            }
-        }
-
-    private suspend fun shouldBounceTunnel(tunnel: TunnelConf): Boolean {
-        if (!isNetworkConnected.value) {
-            Timber.d("Network disconnected, skipping ping for ${tunnel.tunName}")
-            return false
-        }
-        return runCatching { !tunnel.isTunnelPingable(ioDispatcher) }
-            .onFailure { e -> Timber.e(e, "Ping check failed for ${tunnel.tunName}") }
-            .getOrDefault(true)
 	}
 
 	fun stop() {
-        ServiceCompat.stopForeground(this, ServiceCompat.STOP_FOREGROUND_REMOVE)
+		stopForeground(STOP_FOREGROUND_REMOVE)
 		stopSelf()
 	}
 
 	override fun onDestroy() {
-        serviceManager.handleTunnelServiceDestroy()
+		serviceManager.backgroundService = CompletableDeferred()
-        ServiceCompat.stopForeground(this, ServiceCompat.STOP_FOREGROUND_REMOVE)
 		super.onDestroy()
 	}
 
-    private fun createTunnelNotification(tunnelConf: TunnelConf): Notification {
+	private fun createNotification(tunnelConf: TunnelConf): Notification {
 		return notificationManager.createNotification(
 			WireGuardNotification.NotificationChannels.VPN,
 			title = "${getString(R.string.tunnel_running)} - ${tunnelConf.tunName}",
-            actions =
+			actions = listOf(
-                listOf(
+				notificationManager.createNotificationAction(NotificationAction.TUNNEL_OFF, tunnelConf.id),
-                    notificationManager.createNotificationAction(
-                        NotificationAction.TUNNEL_OFF,
-                        tunnelConf.id,
-                    )
 			),
 		)
 	}
-
-    private fun createTunnelsNotification(): Notification {
-        return notificationManager.createNotification(
-            WireGuardNotification.NotificationChannels.VPN,
-            title = "${getString(R.string.tunnel_running)} - ${getString(R.string.multiple)}",
-            actions =
-                listOf(
-                    notificationManager.createNotificationAction(NotificationAction.TUNNEL_OFF, 0)
-                ),
-        )
-    }
-
-    private fun onCreateNotification(): Notification {
-        return notificationManager.createNotification(
-            WireGuardNotification.NotificationChannels.VPN,
-            title = getString(R.string.tunnel_starting),
-        )
-    }
-
-    // TODO add notification handling and optional log reading for restart on handshake failures
-    companion object {
-        const val STATS_DELAY = 1_000L
-        // ipv6 disabled or block on network
-        // Failed to send handshake initiation: write udp [::]"
-        // Failed to send data packets: write udp [::]
-        // Failed to send data packets: write udp 0.0.0.0:51820
-        // Handshake did not complete after 5 seconds, retrying
-    }
 }

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

@@ -1,65 +1,80 @@
 package com.zaneschepke.wireguardautotunnel.core.service.autotunnel
 
 import android.content.Intent
-import android.os.Binder
+import android.net.NetworkCapabilities
 import android.os.IBinder
 import android.os.PowerManager
 import androidx.core.app.ServiceCompat
 import androidx.lifecycle.LifecycleService
 import androidx.lifecycle.lifecycleScope
-import com.zaneschepke.networkmonitor.NetworkMonitor
+import com.wireguard.android.util.RootShell
-import com.zaneschepke.networkmonitor.NetworkStatus
 import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.core.notification.NotificationManager
-import com.zaneschepke.wireguardautotunnel.core.notification.WireGuardNotification
-import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
-import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelManager
-import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
-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.di.AppShell
+import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
+import com.zaneschepke.wireguardautotunnel.di.MainImmediateDispatcher
+import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
 import com.zaneschepke.wireguardautotunnel.domain.state.AutoTunnelState
 import com.zaneschepke.wireguardautotunnel.domain.state.NetworkState
+import com.zaneschepke.wireguardautotunnel.core.network.InternetConnectivityMonitor
+import com.zaneschepke.wireguardautotunnel.core.network.NetworkMonitor
+import com.zaneschepke.wireguardautotunnel.domain.state.ConnectivityState
+import com.zaneschepke.wireguardautotunnel.domain.enums.NotificationAction
+import com.zaneschepke.wireguardautotunnel.core.notification.NotificationManager
+import com.zaneschepke.wireguardautotunnel.core.notification.WireGuardNotification
+import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelManager
+import com.zaneschepke.wireguardautotunnel.domain.entity.AppSettings
+import com.zaneschepke.wireguardautotunnel.domain.enums.BackendState
+import com.zaneschepke.wireguardautotunnel.domain.events.AutoTunnelEvent
+import com.zaneschepke.wireguardautotunnel.domain.events.KillSwitchEvent
 import com.zaneschepke.wireguardautotunnel.util.Constants
 import com.zaneschepke.wireguardautotunnel.util.extensions.Tunnels
+import com.zaneschepke.wireguardautotunnel.util.extensions.getCurrentWifiName
 import dagger.hilt.android.AndroidEntryPoint
-import javax.inject.Inject
+import kotlinx.coroutines.CompletableDeferred
-import javax.inject.Provider
 import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.FlowPreview
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.debounce
 import kotlinx.coroutines.flow.distinctUntilChanged
-import kotlinx.coroutines.flow.flatMapLatest
-import kotlinx.coroutines.flow.flowOn
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
 import timber.log.Timber
+import javax.inject.Inject
+import javax.inject.Provider
 
 @AndroidEntryPoint
 class AutoTunnelService : LifecycleService() {
 
-    @Inject lateinit var networkMonitor: NetworkMonitor
+	@Inject
+	@AppShell
+	lateinit var rootShell: Provider<RootShell>
 
-    @Inject lateinit var appDataRepository: Provider<AppDataRepository>
+	@Inject
+	lateinit var networkMonitor: NetworkMonitor
 
-    @Inject lateinit var notificationManager: NotificationManager
+	@Inject
+	lateinit var appDataRepository: Provider<AppDataRepository>
 
-    @Inject @IoDispatcher lateinit var ioDispatcher: CoroutineDispatcher
+	@Inject
+	lateinit var notificationManager: NotificationManager
 
-    @Inject lateinit var serviceManager: ServiceManager
+	@Inject
+	@IoDispatcher
+	lateinit var ioDispatcher: CoroutineDispatcher
 
-    @Inject lateinit var tunnelManager: TunnelManager
+	@Inject
+	lateinit var serviceManager: ServiceManager
+
+	@Inject
+	@MainImmediateDispatcher
+	lateinit var mainImmediateDispatcher: CoroutineDispatcher
+
+	@Inject
+	lateinit var tunnelManager: TunnelManager
 
 	private val defaultState = AutoTunnelState()
 
@@ -67,85 +82,62 @@ class AutoTunnelService : LifecycleService() {
 
 	private var wakeLock: PowerManager.WakeLock? = null
 
-    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)
+		lifecycleScope.launch(mainImmediateDispatcher) {
+			runCatching {
 				launchWatcherNotification()
+			}.onFailure {
+				Timber.e(it)
+			}
+		}
 	}
 
-    override fun onBind(intent: Intent): IBinder {
+	override fun onBind(intent: Intent): IBinder? {
 		super.onBind(intent)
-        return binder
+		return null
 	}
 
 	override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
 		super.onStartCommand(intent, flags, startId)
 		Timber.d("onStartCommand executed with startId: $startId")
-        start()
+		serviceManager.autoTunnelService.complete(this)
-        return START_STICKY
+		return START_NOT_STICKY
 	}
 
 	fun start() {
-        if (isServiceRunning) return
+		kotlin.runCatching {
-        isServiceRunning = true
+			lifecycleScope.launch(mainImmediateDispatcher) {
-        kotlin
-            .runCatching {
 				launchWatcherNotification()
 				initWakeLock()
+			}
 			startAutoTunnelJob()
 			startAutoTunnelStateJob()
-                killSwitchJob = startKillSwitchJob()
+			startKillSwitchJob()
+		}.onFailure {
+			Timber.e(it)
 		}
-            .onFailure { Timber.e(it) }
 	}
 
 	fun stop() {
-        isServiceRunning = false
 		wakeLock?.let { if (it.isHeld) it.release() }
 		stopSelf()
 	}
 
 	override fun onDestroy() {
-        serviceManager.handleAutoTunnelServiceDestroy()
+		serviceManager.autoTunnelService = CompletableDeferred()
-        restoreVpnKillSwitch()
 		super.onDestroy()
 	}
 
-    private fun restoreVpnKillSwitch() {
+	private fun launchWatcherNotification(description: String = getString(R.string.monitoring_state_changes)) {
-        with(autoTunnelStateFlow.value) {
-            if (
-                settings.isVpnKillSwitchEnabled &&
-                    tunnelManager.getBackendState() != BackendState.KILL_SWITCH_ACTIVE
-            ) {
-                killSwitchJob?.cancel()
-                val allowedIps =
-                    if (settings.isLanOnKillSwitchEnabled) TunnelConf.LAN_BYPASS_ALLOWED_IPS
-                    else emptyList()
-                tunnelManager.setBackendState(BackendState.KILL_SWITCH_ACTIVE, allowedIps)
-            }
-        }
-    }
-
-    private fun launchWatcherNotification(
-        description: String = getString(R.string.monitoring_state_changes)
-    ) {
 		val notification =
 			notificationManager.createNotification(
 				WireGuardNotification.NotificationChannels.AUTO_TUNNEL,
 				title = getString(R.string.auto_tunnel_title),
 				description = description,
-                actions =
+				actions = listOf(
-                    listOf(
+					notificationManager.createNotificationAction(NotificationAction.AUTO_TUNNEL_OFF),
-                        notificationManager.createNotificationAction(
-                            NotificationAction.AUTO_TUNNEL_OFF
-                        )
 				),
 			)
 		ServiceCompat.startForeground(
@@ -157,8 +149,7 @@ class AutoTunnelService : LifecycleService() {
 	}
 
 	private fun initWakeLock() {
-        wakeLock =
+		wakeLock = (getSystemService(POWER_SERVICE) as PowerManager).run {
-            (getSystemService(POWER_SERVICE) as PowerManager).run {
 			val tag = this.javaClass.name
 			newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "$tag::lock").apply {
 				try {
@@ -171,88 +162,69 @@ class AutoTunnelService : LifecycleService() {
 		}
 	}
 
-    private fun buildNetworkState(networkStatus: NetworkStatus): NetworkState {
+	private suspend fun buildNetworkState(connectivityState: ConnectivityState): NetworkState {
 		return with(autoTunnelStateFlow.value.networkState) {
-            val wifiName =
+			val wifiName = when {
-                when (networkStatus) {
+				connectivityState.wifiAvailable &&
-                    is NetworkStatus.Connected -> {
+					(wifiName == null || wifiName == Constants.UNREADABLE_SSID || networkMonitor.didWifiChangeSinceLastCapabilitiesQuery) -> {
-                        networkStatus.wifiSsid
+					networkMonitor.getWifiCapabilities()?.let { getWifiName(it) } ?: wifiName
 				}
-                    else -> null
+				!connectivityState.wifiAvailable -> null
+				else -> wifiName
 			}
 			copy(
-                isWifiConnected = networkStatus.wifiConnected,
+				isWifiConnected = connectivityState.wifiAvailable,
-                isMobileDataConnected = networkStatus.cellularConnected,
+				isMobileDataConnected = connectivityState.cellularAvailable,
-                isEthernetConnected = networkStatus.ethernetConnected,
+				isEthernetConnected = isEthernetConnected,
 				wifiName = wifiName,
 			)
 		}
 	}
 
-    @OptIn(ExperimentalCoroutinesApi::class)
+	private fun startAutoTunnelStateJob() = lifecycleScope.launch(ioDispatcher) {
-    private fun startAutoTunnelStateJob() =
-        lifecycleScope.launch(ioDispatcher) {
 		combine(
 			combineSettings(),
-                    appDataRepository
+			networkMonitor.status.map {
-                        .get()
-                        .settings
-                        .flow
-                        .distinctUntilChanged { old, new ->
-                            old.isKernelEnabled == new.isKernelEnabled
-                        } // Only emit when isKernelEnabled changes
-                        .flatMapLatest {
-                            networkMonitor.networkStatusFlow.flowOn(ioDispatcher).map {
 				buildNetworkState(it)
-                            }
+			}.distinctUntilChanged(),
-                        }
-                        .distinctUntilChanged(),
 		) { double, networkState ->
-                    AutoTunnelState(
+			AutoTunnelState(tunnelManager.activeTunnels().value, networkState, double.first, double.second)
-                        tunnelManager.activeTunnels.value,
+		}.collect { state ->
-                        networkState,
-                        double.first,
-                        double.second,
-                    )
-                }
-                .collect { state ->
 			autoTunnelStateFlow.update {
-                        it.copy(
+				it.copy(activeTunnels = state.activeTunnels, networkState = state.networkState, settings = state.settings, tunnels = state.tunnels)
-                            activeTunnels = state.activeTunnels,
-                            networkState = state.networkState,
-                            settings = state.settings,
-                            tunnels = state.tunnels,
-                        )
 			}
 		}
 	}
 
+	private suspend fun getWifiName(wifiCapabilities: NetworkCapabilities): String? {
+		val setting = appDataRepository.get().settings.get()
+		return if (setting.isWifiNameByShellEnabled) {
+			rootShell.get().getCurrentWifiName()
+		} else {
+			InternetConnectivityMonitor.getNetworkName(wifiCapabilities, this@AutoTunnelService)
+		}
+	}
+
 	private fun combineSettings(): Flow<Pair<AppSettings, Tunnels>> {
 		return combine(
 			appDataRepository.get().settings.flow,
 			appDataRepository.get().tunnels.flow.map { tunnels ->
-                    // isActive is ignored for equality checks so user can manually toggle off
+				// isActive is ignored for equality checks so user can manually toggle off tunnel with auto-tunnel
-                    // tunnel with auto-tunnel
 				tunnels.map { it.copy(isActive = false) }
 			},
 		) { settings, tunnels ->
 			Pair(settings, tunnels)
-            }
+		}.distinctUntilChanged()
-            .distinctUntilChanged()
 	}
 
-    private fun startKillSwitchJob() =
+	private fun startKillSwitchJob() = lifecycleScope.launch(ioDispatcher) {
-        lifecycleScope.launch(ioDispatcher) {
 		autoTunnelStateFlow.collect {
 			if (it == defaultState) return@collect
 			when (val event = it.asKillSwitchEvent()) {
 				KillSwitchEvent.DoNothing -> Unit
 				is KillSwitchEvent.Start -> {
 					Timber.d("Starting kill switch")
-                        tunnelManager.setBackendState(
+					tunnelManager.setBackendState(BackendState.KILL_SWITCH_ACTIVE, event.allowedIps)
-                            BackendState.KILL_SWITCH_ACTIVE,
-                            event.allowedIps,
-                        )
 				}
 				KillSwitchEvent.Stop -> {
 					Timber.d("Stopping kill switch")
@@ -263,48 +235,21 @@ class AutoTunnelService : LifecycleService() {
 	}
 
 	@OptIn(FlowPreview::class)
-    private fun startAutoTunnelJob() =
+	private fun startAutoTunnelJob() = lifecycleScope.launch(ioDispatcher) {
-        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
-                reevaluationJob?.cancel()
+			Timber.d("New auto tunnel state emitted")
-                handleAutoTunnelEvent(watcherState)
+			when (val event = watcherState.asAutoTunnelEvent()) {
-
+				is AutoTunnelEvent.Start -> (event.tunnelConf ?: appDataRepository.get().getPrimaryOrFirstTunnel())?.let {
-                // 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)
 				}
+				// TODO improve this to target specific tunnels to better support multi-tunnel
 				is AutoTunnelEvent.Stop -> tunnelManager.stopTunnel()
-            AutoTunnelEvent.DoNothing -> Timber.i("Auto-tunneling: nothing to do")
+				AutoTunnelEvent.DoNothing -> Timber.i("Auto-tunneling: no condition met")
 			}
 		}
-
-    companion object {
-        const val REEVALUATE_CHECK_DELAY = 5_000L
 	}
 }

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

@@ -4,63 +4,62 @@ import android.content.Intent
 import android.os.IBinder
 import android.service.quicksettings.Tile
 import android.service.quicksettings.TileService
-import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.LifecycleOwner
-import androidx.lifecycle.LifecycleRegistry
-import androidx.lifecycle.lifecycleScope
-import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
 import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
+import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
+import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
 import dagger.hilt.android.AndroidEntryPoint
-import javax.inject.Inject
+import kotlinx.coroutines.CompletableDeferred
+import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
 import timber.log.Timber
+import javax.inject.Inject
 
 @AndroidEntryPoint
-class AutoTunnelControlTile : TileService(), LifecycleOwner {
+class AutoTunnelControlTile : TileService() {
-    @Inject lateinit var appDataRepository: AppDataRepository
+	@Inject
+	lateinit var appDataRepository: AppDataRepository
 
-    @Inject lateinit var serviceManager: ServiceManager
+	@Inject
+	lateinit var serviceManager: ServiceManager
 
-    private val lifecycleRegistry: LifecycleRegistry = LifecycleRegistry(this)
+	@Inject
+	@ApplicationScope
+	lateinit var applicationScope: CoroutineScope
 
 	override fun onCreate() {
 		super.onCreate()
-        lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_CREATE)
+		serviceManager.autoTunnelTile.complete(this)
 	}
 
 	override fun onDestroy() {
 		super.onDestroy()
-        lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_DESTROY)
+		serviceManager.autoTunnelTile = CompletableDeferred()
 	}
 
 	override fun onStartListening() {
 		super.onStartListening()
-        lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_START)
+		serviceManager.autoTunnelTile.complete(this)
-        Timber.d("Start listening called for auto tunnel tile")
+		applicationScope.launch {
-        lifecycleScope.launch {
+			if (appDataRepository.tunnels.getAll().isEmpty()) return@launch setUnavailable()
-            serviceManager.autoTunnelService.collect {
+			updateTileState()
-                if (it != null) return@collect setActive()
-                setInactive()
-            }
-        }
-        lifecycleScope.launch {
-            appDataRepository.tunnels.flow.collect {
-                if (it.isEmpty()) {
-                    setUnavailable()
 		}
 	}
+
+	fun updateTileState() {
+		serviceManager.autoTunnelActive.value.let {
+			if (it) setActive() else setInactive()
 		}
 	}
 
 	override fun onClick() {
 		super.onClick()
 		unlockAndRun {
-            lifecycleScope.launch {
+			applicationScope.launch {
-                if (serviceManager.autoTunnelService.value != null) {
+				if (serviceManager.autoTunnelActive.value) {
 					serviceManager.stopAutoTunnel()
 					setInactive()
 				} else {
-                    serviceManager.startAutoTunnel()
+					serviceManager.startAutoTunnel(true)
 					setActive()
 				}
 			}
@@ -98,7 +97,4 @@ class AutoTunnelControlTile : TileService(), LifecycleOwner {
 			qsTile.updateTile()
 		}
 	}
-
-    override val lifecycle: Lifecycle
-        get() = lifecycleRegistry
 }

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

@@ -5,120 +5,69 @@ import android.os.Build
 import android.os.IBinder
 import android.service.quicksettings.Tile
 import android.service.quicksettings.TileService
-import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.LifecycleOwner
-import androidx.lifecycle.LifecycleRegistry
-import androidx.lifecycle.lifecycleScope
 import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.WireGuardAutoTunnel
 import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
 import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelManager
-import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConf
+import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
 import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
-import com.zaneschepke.wireguardautotunnel.domain.state.TunnelState
 import dagger.hilt.android.AndroidEntryPoint
-import javax.inject.Inject
+import kotlinx.coroutines.CompletableDeferred
+import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
 import timber.log.Timber
+import javax.inject.Inject
 
 @AndroidEntryPoint
-class TunnelControlTile : TileService(), LifecycleOwner {
+class TunnelControlTile : TileService() {
-    @Inject lateinit var appDataRepository: AppDataRepository
+	@Inject
+	lateinit var appDataRepository: AppDataRepository
 
-    @Inject lateinit var serviceManager: ServiceManager
+	@Inject
+	@ApplicationScope
+	lateinit var applicationScope: CoroutineScope
 
-    @Inject lateinit var tunnelManager: TunnelManager
+	@Inject
+	lateinit var serviceManager: ServiceManager
 
-    private val lifecycleRegistry: LifecycleRegistry = LifecycleRegistry(this)
+	@Inject
-
+	lateinit var tunnelManager: TunnelManager
-    private var isCollecting = false
 
 	override fun onCreate() {
 		super.onCreate()
-        lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_CREATE)
+		serviceManager.tunnelControlTile.complete(this)
 	}
 
 	override fun onDestroy() {
 		super.onDestroy()
-        lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_DESTROY)
+		serviceManager.tunnelControlTile = CompletableDeferred()
 	}
 
 	override fun onStartListening() {
 		super.onStartListening()
-        lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_START)
+		Timber.d("Start listening called")
-        Timber.d("Start listening called for tunnel tile")
+		serviceManager.tunnelControlTile.complete(this)
-        if (isCollecting) return
+		applicationScope.launch {
-        isCollecting = true
+			updateTileState()
-        lifecycleScope.launch { tunnelManager.activeTunnels.collect { updateTileState() } }
-    }
-
-    private suspend fun updateTileState() {
-        try {
-            val tunnels = appDataRepository.tunnels.getAll()
-            if (tunnels.isEmpty()) {
-                setUnavailable()
-                return
-            }
-
-            val activeTunnels =
-                tunnelManager.activeTunnels.value.filter { it.value.status.isUpOrStarting() }
-
-            when {
-                activeTunnels.isNotEmpty() -> {
-                    val activeIds = activeTunnels.map { it.key.id }
-                    // TODO improvements would be needed to make this work well with toggling
-                    // multiple tunnels
-                    // this would be better managed elsewhere
-                    WireGuardAutoTunnel.setLastActiveTunnels(activeIds)
-                    updateTileForActiveTunnels(activeTunnels)
-                }
-                else -> updateTileForLastActiveTunnels()
-            }
-        } catch (e: Exception) {
-            setUnavailable()
 		}
 	}
 
-    private fun updateTileForActiveTunnels(activeTunnels: Map<TunnelConf, TunnelState>) {
+	fun updateTileState() = applicationScope.launch {
-        val tileName =
+		if (appDataRepository.tunnels.getAll().isEmpty()) return@launch setUnavailable()
-            when (activeTunnels.size) {
+		with(tunnelManager.activeTunnels().value) {
-                1 -> activeTunnels.keys.first().tunName
+			if (isNotEmpty()) return@launch updateTile(if (size == 1) first().tunName else getString(R.string.multiple), true)
-                else -> getString(R.string.multiple)
-            }
-        updateTile(tileName, true)
-    }
-
-    private suspend fun updateTileForLastActiveTunnels() {
-        val lastActiveIds = WireGuardAutoTunnel.getLastActiveTunnels()
-        when {
-            lastActiveIds.isEmpty() -> {
-                appDataRepository.getStartTunnelConfig()?.let { config ->
-                    updateTile(config.tunName, false)
-                } ?: setUnavailable()
-            }
-            lastActiveIds.size > 1 -> updateTile(getString(R.string.multiple), false)
-            else -> {
-                val tunnelId = lastActiveIds.first()
-                appDataRepository.tunnels.getById(tunnelId)?.let { tunnel ->
-                    updateTile(tunnel.tunName, false)
-                } ?: setUnavailable()
 		}
+		appDataRepository.getStartTunnelConfig()?.let {
+			updateTile(it.tunName, false)
 		}
 	}
 
 	override fun onClick() {
 		super.onClick()
 		unlockAndRun {
-            lifecycleScope.launch {
+			applicationScope.launch {
-                if (tunnelManager.activeTunnels.value.isNotEmpty())
+				if (tunnelManager.activeTunnels().value.isNotEmpty()) return@launch tunnelManager.stopTunnel()
-                    return@launch tunnelManager.stopTunnel()
+				appDataRepository.getStartTunnelConfig()?.let {
-                val lastActive = WireGuardAutoTunnel.getLastActiveTunnels()
+					tunnelManager.startTunnel(it)
-                if (lastActive.isEmpty()) {
-                    appDataRepository.getStartTunnelConfig()?.let { tunnelManager.startTunnel(it) }
-                } else {
-                    lastActive.forEach { id ->
-                        appDataRepository.tunnels.getById(id)?.let { tunnelManager.startTunnel(it) }
-                    }
 				}
 			}
 		}
@@ -148,12 +97,11 @@ class TunnelControlTile : TileService(), LifecycleOwner {
 
 	private fun setTileDescription(description: String) {
 		runCatching {
-            if (qsTile == null) return@runCatching
+			if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+				qsTile.subtitle = description
+			}
 			if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-                qsTile.subtitle = description
 				qsTile.stateDescription = description
-            } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-                qsTile.subtitle = description
 			}
 			qsTile.updateTile()
 		}
@@ -175,10 +123,8 @@ class TunnelControlTile : TileService(), LifecycleOwner {
 			setTileDescription(name)
 			if (active) return setActive()
 			setInactive()
+		}.onFailure {
+			Timber.e(it)
 		}
-            .onFailure { Timber.e(it) }
 	}
-
-    override val lifecycle: Lifecycle
-        get() = lifecycleRegistry
 }

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

@@ -10,10 +10,7 @@ import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.withContext
 
-class DynamicShortcutManager(
+class DynamicShortcutManager(private val context: Context, @IoDispatcher private val ioDispatcher: CoroutineDispatcher) : ShortcutManager {
-    private val context: Context,
-    @IoDispatcher private val ioDispatcher: CoroutineDispatcher,
-) : ShortcutManager {
 	override suspend fun addShortcuts() {
 		withContext(ioDispatcher) {
 			ShortcutManagerCompat.setDynamicShortcuts(context, createShortcuts())
@@ -32,8 +29,7 @@ class DynamicShortcutManager(
 				context.getString(R.string.vpn_off),
 				context.getString(R.string.vpn_off),
 				context.getString(R.string.vpn_off),
-                intent =
+				intent = Intent(context, ShortcutsActivity::class.java).apply {
-                    Intent(context, ShortcutsActivity::class.java).apply {
 					putExtra("className", "WireGuardTunnelService")
 					action = ShortcutsActivity.Action.STOP.name
 				},
@@ -43,8 +39,7 @@ class DynamicShortcutManager(
 				context.getString(R.string.vpn_on),
 				context.getString(R.string.vpn_on),
 				context.getString(R.string.vpn_on),
-                intent =
+				intent = Intent(context, ShortcutsActivity::class.java).apply {
-                    Intent(context, ShortcutsActivity::class.java).apply {
 					putExtra("className", "WireGuardTunnelService")
 					action = ShortcutsActivity.Action.START.name
 				},
@@ -54,8 +49,7 @@ class DynamicShortcutManager(
 				context.getString(R.string.start_auto),
 				context.getString(R.string.start_auto),
 				context.getString(R.string.start_auto),
-                intent =
+				intent = Intent(context, ShortcutsActivity::class.java).apply {
-                    Intent(context, ShortcutsActivity::class.java).apply {
 					putExtra("className", "WireGuardConnectivityWatcherService")
 					action = ShortcutsActivity.Action.START.name
 				},
@@ -65,8 +59,7 @@ class DynamicShortcutManager(
 				context.getString(R.string.stop_auto),
 				context.getString(R.string.stop_auto),
 				context.getString(R.string.stop_auto),
-                intent =
+				intent = Intent(context, ShortcutsActivity::class.java).apply {
-                    Intent(context, ShortcutsActivity::class.java).apply {
 					putExtra("className", "WireGuardConnectivityWatcherService")
 					action = ShortcutsActivity.Action.STOP.name
 				},
@@ -75,13 +68,7 @@ class DynamicShortcutManager(
 		)
 	}
 
-    private fun buildShortcut(
+	private fun buildShortcut(id: String, shortLabel: String, longLabel: String, intent: Intent, shortcutIcon: Int): ShortcutInfoCompat {
-        id: String,
-        shortLabel: String,
-        longLabel: String,
-        intent: Intent,
-        shortcutIcon: Int,
-    ): ShortcutInfoCompat {
 		return ShortcutInfoCompat.Builder(context, id)
 			.setShortLabel(shortLabel)
 			.setLongLabel(longLabel)

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

@@ -2,6 +2,5 @@ package com.zaneschepke.wireguardautotunnel.core.shortcut
 
 interface ShortcutManager {
 	suspend fun addShortcuts()
-
 	suspend fun removeShortcuts()
 }

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

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

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

@@ -1,233 +1,219 @@
 package com.zaneschepke.wireguardautotunnel.core.tunnel
 
-import com.wireguard.android.backend.Tunnel
+import com.zaneschepke.wireguardautotunnel.R
+import com.zaneschepke.wireguardautotunnel.WireGuardAutoTunnel
+import com.zaneschepke.wireguardautotunnel.core.network.NetworkMonitor
+import com.zaneschepke.wireguardautotunnel.core.notification.NotificationManager
+import com.zaneschepke.wireguardautotunnel.core.notification.WireGuardNotification
 import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
+import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelProvider.Companion.CHECK_INTERVAL
 import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
+import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
+import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
 import com.zaneschepke.wireguardautotunnel.domain.enums.BackendError
+import com.zaneschepke.wireguardautotunnel.domain.enums.BackendState
 import com.zaneschepke.wireguardautotunnel.domain.enums.TunnelStatus
-import com.zaneschepke.wireguardautotunnel.domain.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.ui.common.snackbar.SnackbarController
-import java.util.concurrent.ConcurrentHashMap
+import com.zaneschepke.wireguardautotunnel.util.Constants
-import kotlin.concurrent.thread
+import com.zaneschepke.wireguardautotunnel.util.StringValue
+import com.zaneschepke.wireguardautotunnel.util.extensions.cancelWithMessage
+import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.coroutineScope
 import kotlinx.coroutines.delay
-import kotlinx.coroutines.flow.*
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.runBlocking
-import kotlinx.coroutines.sync.Mutex
-import kotlinx.coroutines.sync.withLock
 import timber.log.Timber
+import java.util.concurrent.atomic.AtomicBoolean
 
-abstract class BaseTunnel(
+open class BaseTunnel(
+	@IoDispatcher private val ioDispatcher: CoroutineDispatcher,
 	@ApplicationScope private val applicationScope: CoroutineScope,
+	private val networkMonitor: NetworkMonitor,
 	private val appDataRepository: AppDataRepository,
 	private val serviceManager: ServiceManager,
+	private val notificationManager: NotificationManager,
 ) : TunnelProvider {
 
-    private val _errorEvents =
+	internal val tunnels = MutableStateFlow<List<TunnelConf>>(emptyList())
-        MutableSharedFlow<Pair<TunnelConf, BackendError>>(replay = 0, extraBufferCapacity = 1)
-    override val errorEvents = _errorEvents.asSharedFlow()
 
-    private val activeTuns = MutableStateFlow<Map<TunnelConf, TunnelState>>(emptyMap())
+	private val tunnelJobs = mutableMapOf<TunnelConf, Job>()
-    private val tunThreads = ConcurrentHashMap<Int, Thread>()
-    override val activeTunnels = activeTuns.asStateFlow()
 
-    private val tunMutex = Mutex()
+	private val isNetworkAvailable = AtomicBoolean(false)
-    private val tunStatusMutex = Mutex()
-    private val bounceTunnelMutex = Mutex()
 
-    override val bouncingTunnelIds = ConcurrentHashMap<Int, TunnelStatus.StopReason>()
+	init {
+		applicationScope.launch(ioDispatcher) {
+			launch {
+				startNetworkJob()
+			}
+			tunnels.collect { tuns ->
+				val previousTuns = tunnelJobs.keys.toSet()
+				val newTuns = tuns - previousTuns
+				val removedItems = previousTuns - tuns.toSet()
 
-    abstract suspend fun startBackend(tunnel: TunnelConf)
+				newTuns.forEach { tun ->
-
+					Timber.d("Starting tunnel jobs for tun ${tun.name}")
-    abstract fun stopBackend(tunnel: TunnelConf)
+					tunnelJobs[tun] = startTunnelJobs(tun)
-
-    override fun hasVpnPermission(): Boolean {
-        return serviceManager.hasVpnPermission()
 				}
 
-    protected suspend fun updateTunnelStatus(
+				removedItems.forEach { tun ->
-        tunnelConf: TunnelConf,
+					tunnelJobs[tun]?.cancelWithMessage("Canceling tunnel jobs for tunnel: ${tun.name}")
-        status: TunnelStatus? = null,
+					tunnelJobs.remove(tun)
-        stats: TunnelStatistics? = null,
-    ) {
-        tunStatusMutex.withLock {
-            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)
-                    currentTuns - originalConf
-                } else if (existingState.status == newState && stats == null) {
-                    Timber.d("Skipping redundant state update for ${tunnelConf.id}: $newState")
-                    currentTuns
-                } else {
-                    val updated =
-                        existingState.copy(
-                            status = newState,
-                            statistics = stats ?: existingState.statistics,
-                        )
-                    currentTuns + (originalConf to updated)
-                }
-            }
-        }
-    }
-
-    private suspend fun stopActiveTunnels() {
-        activeTunnels.value.forEach { (config, state) ->
-            if (state.status.isUpOrStarting()) {
-                stopTunnel(config)
-            }
-        }
-    }
-
-    private fun configureTunnelCallbacks(tunnelConf: TunnelConf) {
-        Timber.d("Configuring TunnelConf instance: ${tunnelConf.hashCode()}")
-        tunnelConf.setStateChangeCallback { state ->
-            applicationScope.launch {
-                Timber.d(
-                    "State change callback triggered for tunnel ${tunnelConf.id}: ${tunnelConf.tunName} with state $state at ${System.currentTimeMillis()}"
-                )
-                when (state) {
-                    is Tunnel.State -> updateTunnelStatus(tunnelConf, state.asTunnelState())
-                    is org.amnezia.awg.backend.Tunnel.State ->
-                        updateTunnelStatus(tunnelConf, state.asTunnelState())
-                }
-                handleServiceStateOnChange()
 				}
 				serviceManager.updateTunnelTile()
 			}
 		}
+	}
 
-    override suspend fun updateTunnelStatistics(tunnel: TunnelConf) {
+	private fun startTunnelJobs(tunnel: TunnelConf) = applicationScope.launch(ioDispatcher) {
-        val stats = getStatistics(tunnel)
+		launch {
-        updateTunnelStatus(tunnel, null, stats)
+			startTunnelStatisticsJob(tunnel)
+		}
+		launch {
+			startPingJob(tunnel)
+		}
+		launch {
+			startTunnelConfigChangeJob(tunnel)
+		}
+	}
+
+	override suspend fun bounceTunnel(tunnelConf: TunnelConf) {
+		if (tunnels.value.any { it.id == tunnelConf.id }) {
+			toggleTunnel(tunnelConf, TunnelStatus.DOWN)
+			toggleTunnel(tunnelConf, TunnelStatus.UP)
+		}
+	}
+
+	override suspend fun setBackendState(backendState: BackendState, allowedIps: Collection<String>) {
+	}
+
+	override suspend fun runningTunnelNames(): Set<String> {
+		return emptySet()
+	}
+
+	override suspend fun activeTunnels(): StateFlow<List<TunnelConf>> {
+		return tunnels.asStateFlow()
 	}
 
 	override suspend fun startTunnel(tunnelConf: TunnelConf) {
-        if (activeTuns.exists(tunnelConf.id) || tunThreads.containsKey(tunnelConf.id)) return
+		if (tunnels.value.any { it.id == tunnelConf.id }) return Timber.w("Tunnel already running")
-        if (this@BaseTunnel is UserspaceTunnel) stopActiveTunnels()
+		serviceManager.startBackgroundService(tunnelConf)
-        tunMutex.withLock {
+		appDataRepository.tunnels.save(tunnelConf.copy(isActive = true))
-            tunThreads[tunnelConf.id] = thread {
-                try {
-                    runBlocking {
-                        Timber.d("Starting tunnel ${tunnelConf.id}...")
-                        startTunnelInner(tunnelConf)
-                        Timber.d("Started complete for tunnel ${tunnelConf.name}...")
 	}
-                } catch (e: InterruptedException) {
+
-                    Timber.w(
+	override suspend fun stopTunnel(tunnelConf: TunnelConf?) {
-                        "Tunnel start has been interrupted as ${tunnelConf.name} failed to start"
-                    )
 	}
+
+	open suspend fun toggleTunnel(tunnelConf: TunnelConf, state: TunnelStatus) {
+	}
+
+	open suspend fun getStatistics(tunnelConf: TunnelConf): TunnelStatistics {
+		throw NotImplementedError("Get statistics not implemented in base class")
+	}
+
+	internal suspend fun onTunnelStop(tunnelConf: TunnelConf) {
+		appDataRepository.tunnels.save(tunnelConf.copy(isActive = false))
+		removeFromActiveTunnels(tunnelConf)
+		if (tunnels.value.isEmpty()) serviceManager.stopBackgroundService()
+	}
+
+	internal suspend fun stopAllTunnels() {
+		tunnels.value.forEach {
+			stopTunnel(it)
+		}
+	}
+
+	internal fun addToActiveTunnels(conf: TunnelConf) {
+		tunnels.update {
+			it.toMutableList().apply {
+				add(conf)
 			}
 		}
 	}
 
-    private suspend fun startTunnelInner(tunnelConf: TunnelConf) {
+	private fun removeFromActiveTunnels(conf: TunnelConf) {
-        configureTunnelCallbacks(tunnelConf)
+		tunnels.update {
-        Timber.d("Starting  backend for tunnel ${tunnelConf.id}...")
+			it.toMutableList().apply {
-        try {
+				remove(conf)
-            startBackend(tunnelConf)
+			}
-            updateTunnelStatus(tunnelConf, TunnelStatus.Up)
-            Timber.d("Started for tun ${tunnelConf.id}...")
-            saveTunnelActiveState(tunnelConf, true)
-            serviceManager.startTunnelForegroundService()
-        } catch (e: BackendError) {
-            Timber.e(e, "Failed to start backend for ${tunnelConf.name}")
-            _errorEvents.emit(tunnelConf to e)
-            updateTunnelStatus(tunnelConf, TunnelStatus.Down)
 		}
 	}
 
-    private suspend fun saveTunnelActiveState(tunnelConf: TunnelConf, active: Boolean) {
+	private suspend fun startNetworkJob() = coroutineScope {
-        val tunnelCopy = tunnelConf.copyWithCallback(isActive = active)
+		networkMonitor.status.distinctUntilChanged().collect {
-        appDataRepository.tunnels.save(tunnelCopy)
+			isNetworkAvailable.set(!it.allOffline)
-    }
-
-    override suspend fun stopTunnel(tunnelConf: TunnelConf?, reason: TunnelStatus.StopReason) {
-        if (tunnelConf == null) return stopActiveTunnels()
-        tunMutex.withLock {
-            if (activeTuns.isStarting(tunnelConf.id))
-                return handleStuckStartingTunnelShutdown(tunnelConf)
-            updateTunnelStatus(tunnelConf, TunnelStatus.Stopping(reason))
-            stopTunnelInner(tunnelConf)
 		}
 	}
 
-    private suspend fun stopTunnelInner(tunnelConf: TunnelConf) {
+	private suspend fun startPingJob(tunnel: TunnelConf) = coroutineScope {
-        try {
+		while (isActive) {
-            val tunnel = activeTuns.findTunnel(tunnelConf.id) ?: return
+			if (isNetworkAvailable.get() && tunnel.isActive) {
-            stopBackend(tunnel)
+				val pingResult = tunnel.pingTunnel(ioDispatcher)
-            saveTunnelActiveState(tunnelConf, false)
+				handlePingResult(tunnel, pingResult)
-            removeActiveTunnel(tunnel)
+			}
-        } catch (e: BackendError) {
+			delay(CHECK_INTERVAL)
-            Timber.e(e, "Failed to stop tunnel ${tunnelConf.id}")
-            _errorEvents.emit(tunnelConf to e)
-            updateTunnelStatus(tunnelConf, TunnelStatus.Down)
 		}
 	}
 
-    private fun handleServiceStateOnChange() {
+	private suspend fun handlePingResult(tunnel: TunnelConf, pingResult: List<Boolean>) {
-        if (activeTuns.value.isEmpty() && bouncingTunnelIds.isEmpty())
+		if (pingResult.contains(false)) {
-            serviceManager.stopTunnelForegroundService()
+			if (isNetworkAvailable.get()) {
-    }
+				Timber.i("Ping result: target was not reachable, bouncing the tunnel")
-
+				bounceTunnel(tunnel)
-    private suspend fun handleStuckStartingTunnelShutdown(tunnel: TunnelConf) {
+				delay(tunnel.pingCooldown ?: Constants.PING_COOLDOWN)
-        Timber.d("Stuck in starting state so shutting down tunnel thread for tunnel ${tunnel.name}")
-        try {
-            tunThreads[tunnel.id]?.let {
-                if (it.state != Thread.State.TERMINATED) {
-                    it.interrupt()
 			} else {
-                    Timber.d("Thread already terminated")
+				Timber.i("Ping result: target was not reachable, but no network available")
 			}
-            }
+		} else {
-        } catch (e: Exception) {
+			Timber.i("Ping result: all ping targets were reached successfully")
-            Timber.e(e, "Failed to stop tunnel thread for ${tunnel.name}")
-        } finally {
-            updateTunnelStatus(tunnel, TunnelStatus.Down)
 		}
 	}
 
-    private fun cleanUpTunThread(tunnel: TunnelConf) {
+	internal fun handleBackendThrowable(backendError: BackendError) {
-        Timber.d("Removing thread for ${tunnel.name}")
+		val message = when (backendError) {
-        tunThreads -= tunnel.id
+			BackendError.Config -> StringValue.StringResource(R.string.start_failed_config)
+			BackendError.DNS -> StringValue.StringResource(R.string.dns_error)
+			BackendError.Unauthorized -> StringValue.StringResource(R.string.unauthorized)
 		}
-
+		if (WireGuardAutoTunnel.isForeground()) {
-    private fun removeActiveTunnel(tunnelConf: TunnelConf) {
+			SnackbarController.showMessage(message)
-        activeTuns.update { current -> current.toMutableMap().apply { remove(tunnelConf) } }
+		} else {
-    }
+			notificationManager.show(
-
+				NotificationManager.VPN_NOTIFICATION_ID,
-    override suspend fun bounceTunnel(tunnelConf: TunnelConf, reason: TunnelStatus.StopReason) {
+				notificationManager.createNotification(
-        bounceTunnelMutex.withLock {
+					WireGuardNotification.NotificationChannels.VPN,
-            Timber.i(
+					title = StringValue.StringResource(R.string.tunne_start_failed_title),
-                "Bounce tunnel ${tunnelConf.name} for reason: $reason, current bouncing: ${bouncingTunnelIds.size}"
+					description = message,
-            )
+				),
-            bouncingTunnelIds[tunnelConf.id] = reason
-            try {
-                stopTunnel(tunnelConf, reason)
-                delay(BOUNCE_DELAY)
-                startTunnel(tunnelConf)
-            } finally {
-                bouncingTunnelIds.remove(tunnelConf.id)
-                handleServiceStateOnChange()
-                Timber.d(
-                    "Cleared bounce state for ${tunnelConf.name}, remaining: ${bouncingTunnelIds.size}"
 			)
 		}
 	}
+
+	private suspend fun startTunnelConfigChangeJob(tunnel: TunnelConf) = coroutineScope {
+		appDataRepository.tunnels.flow.collect { storageTuns ->
+			storageTuns.firstOrNull { it.id == tunnel.id }?.let { storageTun ->
+				if (tunnel.isQuickConfigChanged(storageTun) || tunnel.isPingConfigMatching(storageTun)) {
+					bounceTunnel(tunnel)
+				}
+			}
+		}
 	}
 
-    override suspend fun runningTunnelNames(): Set<String> =
+	private suspend fun startTunnelStatisticsJob(tunnel: TunnelConf) = coroutineScope {
-        activeTuns.value.keys.map { it.tunName }.toSet()
+		while (isActive) {
-
+			val stats = getStatistics(tunnel)
-    companion object {
+			tunnel.state.update {
-        const val BOUNCE_DELAY = 300L
+				it.copy(statistics = stats)
+			}
+			delay(CHECK_INTERVAL)
+		}
 	}
 }

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

@@ -1,50 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.core.tunnel
-
-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
-
-fun Map<TunnelConf, TunnelState>.allDown(): Boolean {
-    return this.all { it.value.status.isDown() }
-}
-
-fun Map<TunnelConf, TunnelState>.hasActive(): Boolean {
-    return this.any { it.value.status.isUp() }
-}
-
-fun Map<TunnelConf, TunnelState>.getValueById(id: Int): TunnelState? {
-    val key = this.keys.find { it.id == id }
-    return key?.let { this@getValueById[it] }
-}
-
-fun Map<TunnelConf, TunnelState>.getKeyById(id: Int): TunnelConf? {
-    return this.keys.find { it.id == id }
-}
-
-fun Map<TunnelConf, TunnelState>.isUp(tunnelConf: TunnelConf): Boolean {
-    return this.getValueById(tunnelConf.id)?.status?.isUp() ?: false
-}
-
-fun MutableStateFlow<Map<TunnelConf, TunnelState>>.exists(id: Int): Boolean {
-    return this.value.any { it.key.id == id }
-}
-
-fun MutableStateFlow<Map<TunnelConf, TunnelState>>.isUp(id: Int): Boolean {
-    return this.value.any { it.key.id == id && it.value.status == TunnelStatus.Up }
-}
-
-fun MutableStateFlow<Map<TunnelConf, TunnelState>>.isStarting(id: Int): Boolean {
-    return this.value.any { it.key.id == id && it.value.status == TunnelStatus.Starting }
-}
-
-fun MutableStateFlow<Map<TunnelConf, TunnelState>>.findTunnel(id: Int): TunnelConf? {
-    return this.value.keys.find { it.id == id }
-}
-
-private val URL_PATTERN =
-    Regex("""^([a-zA-Z0-9]([a-zA-Z0-9\-]{0,61}[a-zA-Z0-9])?\.)+[a-zA-Z]{2,}:[0-9]{1,5}$""")
-
-fun String.isUrl(): Boolean {
-    return URL_PATTERN.matches(this)
-}

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

@@ -3,63 +3,80 @@ package com.zaneschepke.wireguardautotunnel.core.tunnel
 import com.wireguard.android.backend.Backend
 import com.wireguard.android.backend.BackendException
 import com.wireguard.android.backend.Tunnel
+import com.zaneschepke.wireguardautotunnel.core.network.NetworkMonitor
+import com.zaneschepke.wireguardautotunnel.core.notification.NotificationManager
 import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
 import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
+import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
+import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
 import com.zaneschepke.wireguardautotunnel.domain.enums.BackendState
 import com.zaneschepke.wireguardautotunnel.domain.enums.TunnelStatus
-import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConf
 import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
 import com.zaneschepke.wireguardautotunnel.domain.state.TunnelStatistics
 import com.zaneschepke.wireguardautotunnel.domain.state.WireGuardStatistics
 import com.zaneschepke.wireguardautotunnel.util.extensions.toBackendError
-import javax.inject.Inject
+import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.withContext
 import timber.log.Timber
+import javax.inject.Inject
 
-class KernelTunnel
+class KernelTunnel @Inject constructor(
-@Inject
+	@IoDispatcher private val ioDispatcher: CoroutineDispatcher,
-constructor(
 	@ApplicationScope private val applicationScope: CoroutineScope,
 	serviceManager: ServiceManager,
 	appDataRepository: AppDataRepository,
+	notificationManager: NotificationManager,
 	private val backend: Backend,
-) : BaseTunnel(applicationScope, appDataRepository, serviceManager) {
+	networkMonitor: NetworkMonitor,
+) : BaseTunnel(ioDispatcher, applicationScope, networkMonitor, appDataRepository, serviceManager, notificationManager) {
 
-    override fun getStatistics(tunnelConf: TunnelConf): TunnelStatistics? {
+	override suspend fun startTunnel(tunnelConf: TunnelConf) {
-        return try {
+		withContext(ioDispatcher) {
-            WireGuardStatistics(backend.getStatistics(tunnelConf))
+			super.startTunnel(tunnelConf)
-        } catch (e: Exception) {
+			runCatching {
-            Timber.e(e)
+				backend.setState(tunnelConf, Tunnel.State.UP, tunnelConf.toWgConfig())
-            null
+				addToActiveTunnels(tunnelConf)
+			}.onFailure {
+				onTunnelStop(tunnelConf)
+				if (it is BackendException) {
+					handleBackendThrowable(it.toBackendError())
+				} else {
+					Timber.e(it)
+				}
+			}
 		}
 	}
 
-    override suspend fun startBackend(tunnel: TunnelConf) {
+	override suspend fun getStatistics(tunnelConf: TunnelConf): TunnelStatistics {
-        try {
+		return WireGuardStatistics(backend.getStatistics(tunnelConf))
-            updateTunnelStatus(tunnel, TunnelStatus.Starting)
+	}
-            backend.setState(tunnel, Tunnel.State.UP, tunnel.toWgConfig())
+
-        } catch (e: BackendException) {
+	override suspend fun stopTunnel(tunnelConf: TunnelConf?) {
-            throw e.toBackendError()
+		withContext(ioDispatcher) {
+			val tunnel = tunnels.value.firstOrNull { it.id == tunnelConf?.id }
+			runCatching {
+				tunnel?.let {
+					backend.setState(it, Tunnel.State.DOWN, it.toWgConfig())
+					onTunnelStop(it)
+				} ?: stopAllTunnels()
+			}.onFailure {
+				Timber.e(it)
+			}
 		}
 	}
 
-    override fun stopBackend(tunnel: TunnelConf) {
+	override suspend fun toggleTunnel(tunnelConf: TunnelConf, status: TunnelStatus) {
-        Timber.i("Stopping tunnel ${tunnel.id} kernel")
+		when (status) {
-        try {
+			TunnelStatus.UP -> backend.setState(tunnelConf, Tunnel.State.UP, tunnelConf.toWgConfig())
-            backend.setState(tunnel, Tunnel.State.DOWN, tunnel.toWgConfig())
+			TunnelStatus.DOWN -> backend.setState(tunnelConf, Tunnel.State.DOWN, tunnelConf.toWgConfig())
-        } catch (e: BackendException) {
-            throw e.toBackendError()
 		}
 	}
 
-    override fun setBackendState(backendState: BackendState, allowedIps: Collection<String>) {
+	override suspend fun setBackendState(backendState: BackendState, allowedIps: Collection<String>) {
 		Timber.w("Not yet implemented for kernel")
 	}
 
-    override fun getBackendState(): BackendState {
-        return BackendState.INACTIVE
-    }
-
 	override suspend fun runningTunnelNames(): Set<String> {
 		return backend.runningTunnelNames
 	}

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

@@ -4,29 +4,23 @@ 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.enums.BackendError
+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.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.util.extensions.withData
-import java.util.concurrent.ConcurrentHashMap
-import javax.inject.Inject
 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.StateFlow
 import kotlinx.coroutines.flow.filterNotNull
-import kotlinx.coroutines.flow.flatMapLatest
+import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.stateIn
-import kotlinx.coroutines.launch
 import kotlinx.coroutines.plus
+import kotlinx.coroutines.withContext
+import javax.inject.Inject
 
-class TunnelManager
+class TunnelManager @Inject constructor(
-@Inject
-constructor(
 	@Kernel private val kernelTunnel: TunnelProvider,
 	@Userspace private val userspaceTunnel: TunnelProvider,
 	private val appDataRepository: AppDataRepository,
@@ -34,91 +28,71 @@ constructor(
 	@IoDispatcher private val ioDispatcher: CoroutineDispatcher,
 ) : TunnelProvider {
 
-    @OptIn(ExperimentalCoroutinesApi::class)
+	val appSettings: StateFlow<AppSettings?> = appDataRepository.settings.flow.stateIn(
-    private val tunnelProviderFlow =
-        appDataRepository.settings.flow
-            .filterNotNull()
-            .flatMapLatest { settings ->
-                MutableStateFlow(if (settings.isKernelEnabled) kernelTunnel else userspaceTunnel)
-            }
-            .stateIn(
 		scope = applicationScope.plus(ioDispatcher),
 		started = SharingStarted.Eagerly,
-                initialValue = userspaceTunnel,
+		initialValue = null,
 	)
 
-    @OptIn(ExperimentalCoroutinesApi::class)
+	override suspend fun activeTunnels(): StateFlow<List<TunnelConf>> {
-    override val activeTunnels =
+		return withContext(ioDispatcher) {
-        appDataRepository.settings.flow
+			appSettings.filterNotNull().first().let {
-            .filterNotNull()
+				if (it.isKernelEnabled) return@withContext kernelTunnel.activeTunnels()
-            .flatMapLatest { settings ->
+				userspaceTunnel.activeTunnels()
-                if (settings.isKernelEnabled) {
-                    kernelTunnel.activeTunnels
-                } else {
-                    userspaceTunnel.activeTunnels
 			}
 		}
-            .stateIn(
-                scope = applicationScope.plus(ioDispatcher),
-                started = SharingStarted.Eagerly,
-                initialValue = emptyMap(),
-            )
-
-    override val errorEvents: SharedFlow<Pair<TunnelConf, BackendError>>
-        get() = tunnelProviderFlow.value.errorEvents
-
-    override val bouncingTunnelIds: ConcurrentHashMap<Int, TunnelStatus.StopReason> =
-        tunnelProviderFlow.value.bouncingTunnelIds
-
-    override fun hasVpnPermission(): Boolean {
-        return userspaceTunnel.hasVpnPermission()
-    }
-
-    override suspend fun updateTunnelStatistics(tunnel: TunnelConf) {
-        tunnelProviderFlow.value.updateTunnelStatistics(tunnel)
 	}
 
 	override suspend fun startTunnel(tunnelConf: TunnelConf) {
-        tunnelProviderFlow.value.startTunnel(tunnelConf)
+		appSettings.withData {
+			if (it.isKernelEnabled) return@withData kernelTunnel.startTunnel(tunnelConf)
+			userspaceTunnel.startTunnel(tunnelConf)
+		}
 	}
 
-    override suspend fun stopTunnel(tunnelConf: TunnelConf?, reason: TunnelStatus.StopReason) {
+	override suspend fun stopTunnel(tunnelConf: TunnelConf?) {
-        tunnelProviderFlow.value.stopTunnel(tunnelConf, reason)
+		appSettings.withData {
+			if (it.isKernelEnabled) return@withData kernelTunnel.stopTunnel(tunnelConf)
+			userspaceTunnel.stopTunnel(tunnelConf)
+		}
 	}
 
-    override suspend fun bounceTunnel(tunnelConf: TunnelConf, reason: TunnelStatus.StopReason) {
+	override suspend fun bounceTunnel(tunnelConf: TunnelConf) {
-        tunnelProviderFlow.value.bounceTunnel(tunnelConf, reason)
+		appSettings.withData {
+			if (it.isKernelEnabled) return@withData kernelTunnel.stopTunnel(tunnelConf)
+			userspaceTunnel.stopTunnel(tunnelConf)
+		}
 	}
 
-    override fun setBackendState(backendState: BackendState, allowedIps: Collection<String>) {
+	override suspend fun setBackendState(backendState: BackendState, allowedIps: Collection<String>) {
-        tunnelProviderFlow.value.setBackendState(backendState, allowedIps)
+		appSettings.withData {
+			if (it.isKernelEnabled) return@withData kernelTunnel.setBackendState(backendState, allowedIps)
+			userspaceTunnel.setBackendState(backendState, allowedIps)
 		}
-
-    override fun getBackendState(): BackendState {
-        return tunnelProviderFlow.value.getBackendState()
 	}
 
 	override suspend fun runningTunnelNames(): Set<String> {
-        return tunnelProviderFlow.value.runningTunnelNames()
+		appSettings.filterNotNull().first().let {
+			if (it.isKernelEnabled) return kernelTunnel.runningTunnelNames()
+			return userspaceTunnel.runningTunnelNames()
+		}
 	}
 
-    override fun getStatistics(tunnelConf: TunnelConf): TunnelStatistics? {
+	suspend fun restorePreviousState() {
-        return tunnelProviderFlow.value.getStatistics(tunnelConf)
+		withContext(ioDispatcher) {
-    }
+			with(appDataRepository.settings.get()) {
-
+				if (isRestoreOnBootEnabled) {
-    fun restorePreviousState() =
-        applicationScope.launch(ioDispatcher) {
-            val settings = appDataRepository.settings.get()
-            if (settings.isRestoreOnBootEnabled) {
 					val previouslyActiveTuns = appDataRepository.tunnels.getActive()
-                val tunsToStart =
+					// handle kernel mode
-                    previouslyActiveTuns.filterNot { tun ->
+					val tunsToStart = previouslyActiveTuns.filterNot { tun -> activeTunnels().value.any { tun.id == it.id } }
-                        activeTunnels.value.any { tun.id == it.key.id }
+					if (isKernelEnabled) {
+						return@withContext tunsToStart.forEach {
+							startTunnel(it)
+						}
+					}
+					// handle userspace
+					if (activeTunnels().value.isEmpty()) tunsToStart.firstOrNull()?.let { startTunnel(it) }
 				}
-                if (settings.isKernelEnabled) {
-                    return@launch tunsToStart.forEach { startTunnel(it) }
-                } else {
-                    tunsToStart.firstOrNull()?.let { startTunnel(it) }
 			}
 		}
 	}

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

@@ -1,58 +1,24 @@
 package com.zaneschepke.wireguardautotunnel.core.tunnel
 
-import com.zaneschepke.wireguardautotunnel.domain.enums.BackendError
+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.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 {
-    /** Starts the specified tunnel configuration. */
+
+	suspend fun activeTunnels(): StateFlow<List<TunnelConf>>
+
 	suspend fun startTunnel(tunnelConf: TunnelConf)
 
-    /**
+	suspend fun stopTunnel(tunnelConf: TunnelConf? = null)
-     * Stops the specified tunnel, or all tunnels if none is provided.
-     *
-     * @param tunnelConf The tunnel to stop, or null to stop all active tunnels.
-     * @param reason The reason for stopping, defaults to USER for manual stops. Callers should
-     *   override with specific reasons (e.g., PING, CONFIG_CHANGED) when applicable.
-     */
-    suspend fun stopTunnel(
-        tunnelConf: TunnelConf? = null,
-        reason: TunnelStatus.StopReason = TunnelStatus.StopReason.USER,
-    )
 
-    /**
+	suspend fun bounceTunnel(tunnelConf: TunnelConf)
-     * Bounces (stops and restarts) the specified tunnel.
-     *
-     * @param tunnelConf The tunnel to bounce.
-     * @param reason The reason for bouncing, defaults to USER for manual actions. Callers should
-     *   override with specific reasons (e.g., PING, CONFIG_CHANGED) when applicable.
-     */
-    suspend fun bounceTunnel(
-        tunnelConf: TunnelConf,
-        reason: TunnelStatus.StopReason = TunnelStatus.StopReason.USER,
-    )
 
-    fun setBackendState(backendState: BackendState, allowedIps: Collection<String>)
+	suspend fun setBackendState(backendState: BackendState, allowedIps: Collection<String>)
-
-    fun getBackendState(): BackendState
 
 	suspend fun runningTunnelNames(): Set<String>
 
-    fun getStatistics(tunnelConf: TunnelConf): TunnelStatistics?
+	companion object {
-
+		const val CHECK_INTERVAL = 1_000L
-    val activeTunnels: StateFlow<Map<TunnelConf, TunnelState>>
+	}
-
-    val errorEvents: SharedFlow<Pair<TunnelConf, BackendError>>
-
-    val bouncingTunnelIds: ConcurrentHashMap<Int, TunnelStatus.StopReason>
-
-    fun hasVpnPermission(): Boolean
-
-    suspend fun updateTunnelStatistics(tunnel: TunnelConf)
 }

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

@@ -1,108 +1,83 @@
 package com.zaneschepke.wireguardautotunnel.core.tunnel
 
+import com.wireguard.android.backend.BackendException
+import com.zaneschepke.wireguardautotunnel.core.network.NetworkMonitor
+import com.zaneschepke.wireguardautotunnel.core.notification.NotificationManager
 import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
 import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
+import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
+import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
 import com.zaneschepke.wireguardautotunnel.domain.enums.BackendState
 import com.zaneschepke.wireguardautotunnel.domain.enums.TunnelStatus
-import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConf
 import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
 import com.zaneschepke.wireguardautotunnel.domain.state.AmneziaStatistics
 import com.zaneschepke.wireguardautotunnel.domain.state.TunnelStatistics
 import com.zaneschepke.wireguardautotunnel.util.extensions.asAmBackendState
-import com.zaneschepke.wireguardautotunnel.util.extensions.asBackendState
 import com.zaneschepke.wireguardautotunnel.util.extensions.toBackendError
-import javax.inject.Inject
+import kotlinx.coroutines.CoroutineDispatcher
-import kotlin.jvm.optionals.getOrNull
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.withContext
 import org.amnezia.awg.backend.Backend
-import org.amnezia.awg.backend.BackendException
 import org.amnezia.awg.backend.Tunnel
-import org.amnezia.awg.config.Config
 import timber.log.Timber
+import javax.inject.Inject
 
-class UserspaceTunnel
+class UserspaceTunnel @Inject constructor(
-@Inject
+	@IoDispatcher private val ioDispatcher: CoroutineDispatcher,
-constructor(
 	@ApplicationScope private val applicationScope: CoroutineScope,
-    val serviceManager: ServiceManager,
+	serviceManager: ServiceManager,
-    val appDataRepository: AppDataRepository,
+	appDataRepository: AppDataRepository,
+	notificationManager: NotificationManager,
 	private val backend: Backend,
-) : BaseTunnel(applicationScope, appDataRepository, serviceManager) {
+	networkMonitor: NetworkMonitor,
+) : TunnelProvider, BaseTunnel(ioDispatcher, applicationScope, networkMonitor, appDataRepository, serviceManager, notificationManager) {
 
-    private var previousBackendState: Pair<BackendState, Boolean>? = null
+	override suspend fun startTunnel(tunnelConf: TunnelConf) {
-
+		withContext(ioDispatcher) {
-    override suspend fun startBackend(tunnel: TunnelConf) {
+			super.startTunnel(tunnelConf)
-        try {
+			runCatching {
-            updateTunnelStatus(tunnel, TunnelStatus.Starting)
+				backend.setState(tunnelConf, Tunnel.State.UP, tunnelConf.toAmConfig())
-            val amConfig = tunnel.toAmConfig()
+				addToActiveTunnels(tunnelConf)
-            handleVpnKillSwitchWithDomainEndpoints(amConfig)
+			}.onFailure {
-            backend.setState(tunnel, Tunnel.State.UP, amConfig)
+				onTunnelStop(tunnelConf)
-        } catch (e: BackendException) {
+				if (it is BackendException) {
-            Timber.e(e, "Failed to start up backend for tunnel ${tunnel.name}")
+					handleBackendThrowable(it.toBackendError())
-            throw e.toBackendError()
+				} else {
+					Timber.e(it)
+				}
+			}
 		}
 	}
 
-    override fun stopBackend(tunnel: TunnelConf) {
+	override suspend fun getStatistics(tunnelConf: TunnelConf): TunnelStatistics {
-        Timber.i("Stopping tunnel ${tunnel.name} userspace")
+		return AmneziaStatistics(backend.getStatistics(tunnelConf))
-        try {
+	}
-            backend.setState(tunnel, Tunnel.State.DOWN, tunnel.toAmConfig())
+
-        } catch (e: BackendException) {
+	override suspend fun toggleTunnel(tunnelConf: TunnelConf, status: TunnelStatus) {
-            Timber.e(e, "Failed to stop tunnel ${tunnel.id}")
+		when (status) {
-            throw e.toBackendError()
+			TunnelStatus.UP -> backend.setState(tunnelConf, Tunnel.State.UP, tunnelConf.toAmConfig())
-        } finally {
+			TunnelStatus.DOWN -> backend.setState(tunnelConf, Tunnel.State.DOWN, tunnelConf.toAmConfig())
-            handlePreviouslyEnabledVpnKillSwitch()
 		}
 	}
 
-    // stop vpn kill switch if we need to resolve DNS for peer endpoints
+	override suspend fun stopTunnel(tunnelConf: TunnelConf?) {
-    private suspend fun handleVpnKillSwitchWithDomainEndpoints(config: Config) {
+		withContext(ioDispatcher) {
-        if (
+			runCatching {
-            config.peers.any { it.endpoint.getOrNull()?.toString()?.isUrl() == true } &&
+				tunnels.value.firstOrNull { it.id == tunnelConf?.id }?.let {
-                backend.backendState.asBackendState() == BackendState.KILL_SWITCH_ACTIVE
+					backend.setState(it, Tunnel.State.DOWN, it.toAmConfig())
-        ) {
+					onTunnelStop(it)
-            val bypassLan = appDataRepository.settings.get().isLanOnKillSwitchEnabled
+				} ?: stopAllTunnels()
-            previousBackendState = Pair(BackendState.KILL_SWITCH_ACTIVE, bypassLan)
+			}.onFailure {
-            setBackendState(BackendState.SERVICE_ACTIVE, emptyList())
+				Timber.e(it)
+			}
 		}
 	}
 
-    // restore vpn kill switch if needed
+	override suspend fun setBackendState(backendState: BackendState, allowedIps: Collection<String>) {
-    private fun handlePreviouslyEnabledVpnKillSwitch() {
-        // let auto tunnel handle this if it is active
-        if (serviceManager.autoTunnelService.value == null) {
-            previousBackendState?.let { (state, lanEnabled) ->
-                Timber.d("Restoring kill switch configuration")
-                val lan = if (lanEnabled) TunnelConf.LAN_BYPASS_ALLOWED_IPS else emptyList()
-                backend.setBackendState(state.asAmBackendState(), lan)
-            }
-        }
-        previousBackendState = null
-    }
-
-    override fun setBackendState(backendState: BackendState, allowedIps: Collection<String>) {
-        Timber.d("Setting backend state: $backendState with allowedIps: $allowedIps")
-        try {
 		backend.setBackendState(backendState.asAmBackendState(), allowedIps)
-        } catch (e: BackendException) {
-            throw e.toBackendError()
-        }
-    }
-
-    override fun getBackendState(): BackendState {
-        return backend.backendState.asBackendState()
 	}
 
 	override suspend fun runningTunnelNames(): Set<String> {
 		return backend.runningTunnelNames
 	}
-
-    override fun getStatistics(tunnelConf: TunnelConf): TunnelStatistics? {
-        return try {
-            AmneziaStatistics(backend.getStatistics(tunnelConf))
-        } catch (e: Exception) {
-            Timber.e(e, "Failed to get stats for ${tunnelConf.tunName}")
-            null
-        }
-    }
 }

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

@@ -13,15 +13,13 @@ import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
 import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedInject
-import java.util.concurrent.TimeUnit
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.withContext
 import timber.log.Timber
+import java.util.concurrent.TimeUnit
 
 @HiltWorker
-class ServiceWorker
+class ServiceWorker @AssistedInject constructor(
-@AssistedInject
-constructor(
 	@Assisted private val context: Context,
 	@Assisted private val params: WorkerParameters,
 	private val serviceManager: ServiceManager,
@@ -38,12 +36,10 @@ constructor(
 		}
 
 		fun start(context: Context) {
-            val periodicWorkRequest =
+			val periodicWorkRequest = PeriodicWorkRequestBuilder<ServiceWorker>(
-                PeriodicWorkRequestBuilder<ServiceWorker>(
 				repeatInterval = 15,
 				repeatIntervalTimeUnit = TimeUnit.MINUTES,
-                    )
+			).build()
-                    .build()
 			WorkManager.getInstance(context)
 				.enqueueUniquePeriodicWork(
 					TAG,
@@ -53,14 +49,11 @@ constructor(
 		}
 	}
 
-    override suspend fun doWork(): Result =
+	override suspend fun doWork(): Result = withContext(ioDispatcher) {
-        withContext(ioDispatcher) {
 		Timber.i("Service worker started")
 		with(appDataRepository.settings.get()) {
-                if (isAutoTunnelEnabled && serviceManager.autoTunnelService.value == null)
+			if (isAutoTunnelEnabled && !serviceManager.autoTunnelActive.value) return@with serviceManager.startAutoTunnel(true)
-                    return@with serviceManager.startAutoTunnel()
+			if (tunnelManager.activeTunnels().value.isEmpty()) tunnelManager.restorePreviousState()
-                if (tunnelManager.activeTunnels.value.isEmpty())
-                    tunnelManager.restorePreviousState()
 		}
 		Result.success()
 	}

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

@@ -8,46 +8,83 @@ 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.entity.Settings
+import com.zaneschepke.wireguardautotunnel.data.model.Settings
-import com.zaneschepke.wireguardautotunnel.data.entity.TunnelConfig
+import com.zaneschepke.wireguardautotunnel.data.model.TunnelConfig
 
 @Database(
 	entities = [Settings::class, TunnelConfig::class],
-    version = 17,
+	version = 16,
 	autoMigrations =
 	[
 		AutoMigration(from = 1, to = 2),
 		AutoMigration(from = 2, to = 3),
-            AutoMigration(from = 3, to = 4),
+		AutoMigration(
-            AutoMigration(from = 4, to = 5),
+			from = 3,
-            AutoMigration(from = 5, to = 6),
+			to = 4,
-            AutoMigration(from = 6, to = 7, spec = RemoveLegacySettingColumnsMigration::class),
+		),
+		AutoMigration(
+			from = 4,
+			to = 5,
+		),
+		AutoMigration(
+			from = 5,
+			to = 6,
+		),
+		AutoMigration(
+			from = 6,
+			to = 7,
+			spec = RemoveLegacySettingColumnsMigration::class,
+		),
 		AutoMigration(7, 8),
 		AutoMigration(8, 9),
 		AutoMigration(9, 10),
-            AutoMigration(from = 10, to = 11, spec = RemoveTunnelPauseMigration::class),
+		AutoMigration(
-            AutoMigration(from = 11, to = 12),
+			from = 10,
-            AutoMigration(from = 12, to = 13),
+			to = 11,
-            AutoMigration(from = 13, to = 14),
+			spec = RemoveTunnelPauseMigration::class,
-            AutoMigration(from = 14, to = 15),
+		),
-            AutoMigration(from = 15, to = 16),
+		AutoMigration(
-            AutoMigration(from = 16, to = 17, spec = WifiDetectionMigration::class),
+			from = 11,
+			to = 12,
+		),
+		AutoMigration(
+			from = 12,
+			to = 13,
+		),
+		AutoMigration(
+			from = 13,
+			to = 14,
+		),
+		AutoMigration(
+			from = 14,
+			to = 15,
+		),
+		AutoMigration(
+			from = 15,
+			to = 16,
+		),
 	],
 	exportSchema = true,
 )
-@TypeConverters(DatabaseConverters::class)
+@TypeConverters(DatabaseListConverters::class)
 abstract class AppDatabase : RoomDatabase() {
 	abstract fun settingDao(): SettingsDao
 
 	abstract fun tunnelConfigDoa(): TunnelConfigDao
 }
 
-@DeleteColumn(tableName = "Settings", columnName = "default_tunnel")
+@DeleteColumn(
-@DeleteColumn(tableName = "Settings", columnName = "is_battery_saver_enabled")
+	tableName = "Settings",
+	columnName = "default_tunnel",
+)
+@DeleteColumn(
+	tableName = "Settings",
+	columnName = "is_battery_saver_enabled",
+)
 class RemoveLegacySettingColumnsMigration : AutoMigrationSpec
 
-@DeleteColumn(tableName = "Settings", columnName = "is_auto_tunnel_paused")
+@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/DataStoreManager.kt

@@ -7,7 +7,6 @@ import androidx.datastore.preferences.core.edit
 import androidx.datastore.preferences.core.stringPreferencesKey
 import androidx.datastore.preferences.preferencesDataStore
 import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
-import java.io.IOException
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.first
@@ -16,6 +15,7 @@ import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.withContext
 import timber.log.Timber
+import java.io.IOException
 
 class DataStoreManager(
 	private val context: Context,
@@ -24,18 +24,20 @@ class DataStoreManager(
 	companion object {
 		val locationDisclosureShown = booleanPreferencesKey("LOCATION_DISCLOSURE_SHOWN")
 		val batteryDisableShown = booleanPreferencesKey("BATTERY_OPTIMIZE_DISABLE_SHOWN")
+		val currentSSID = stringPreferencesKey("CURRENT_SSID")
 		val pinLockEnabled = booleanPreferencesKey("PIN_LOCK_ENABLED")
-        val expandedTunnelIds = stringPreferencesKey("EXPANDED_TUNNEL_IDS")
+		val tunnelStatsExpanded = booleanPreferencesKey("TUNNEL_STATS_EXPANDED")
 		val isLocalLogsEnabled = booleanPreferencesKey("LOCAL_LOGS_ENABLED")
 		val locale = stringPreferencesKey("LOCALE")
 		val theme = stringPreferencesKey("THEME")
-        val isRemoteControlEnabled = booleanPreferencesKey("IS_REMOTE_CONTROL_ENABLED")
-        val remoteKey = stringPreferencesKey("REMOTE_KEY")
 	}
 
 	// preferences
 	private val preferencesKey = "preferences"
-    private val Context.dataStore by preferencesDataStore(name = preferencesKey)
+	private val Context.dataStore by
+		preferencesDataStore(
+			name = preferencesKey,
+		)
 
 	suspend fun init() {
 		withContext(ioDispatcher) {

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

@@ -5,8 +5,8 @@ import androidx.sqlite.db.SupportSQLiteDatabase
 import timber.log.Timber
 
 class DatabaseCallback : RoomDatabase.Callback() {
-    override fun onCreate(db: SupportSQLiteDatabase) =
+	override fun onCreate(db: SupportSQLiteDatabase) = db.run {
-        db.run {
+		// Notice non-ui thread is here
 		beginTransaction()
 		try {
 			execSQL(Queries.createDefaultSettings())

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

@@ -1,30 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.data
-
-import androidx.room.TypeConverter
-import com.zaneschepke.wireguardautotunnel.data.entity.Settings
-import kotlinx.serialization.json.Json
-
-class DatabaseConverters {
-    @TypeConverter
-    fun listToString(value: MutableList<String>): String {
-        return Json.encodeToString(value)
-    }
-
-    @TypeConverter
-    fun stringToList(value: String): MutableList<String> {
-        if (value.isBlank() || value.isEmpty()) return mutableListOf()
-        return try {
-            Json.decodeFromString<MutableList<String>>(value)
-        } catch (e: Exception) {
-            val list = value.split(",").toMutableList()
-            val json = listToString(list)
-            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/DatabaseListConverters.kt

@@ -0,0 +1,24 @@
+package com.zaneschepke.wireguardautotunnel.data
+
+import androidx.room.TypeConverter
+import kotlinx.serialization.encodeToString
+import kotlinx.serialization.json.Json
+
+class DatabaseListConverters {
+	@TypeConverter
+	fun listToString(value: MutableList<String>): String {
+		return Json.encodeToString(value)
+	}
+
+	@TypeConverter
+	fun stringToList(value: String): MutableList<String> {
+		if (value.isBlank() || value.isEmpty()) return mutableListOf()
+		return try {
+			Json.decodeFromString<MutableList<String>>(value)
+		} catch (e: Exception) {
+			val list = value.split(",").toMutableList()
+			val json = listToString(list)
+			Json.decodeFromString<MutableList<String>>(json)
+		}
+	}
+}

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

@@ -24,14 +24,12 @@ object Queries {
 		        'false',
 		        'false',
 		        'false')
-		"""
+		""".trimIndent()
-            .trimIndent()
 	}
 
 	fun createTunnelConfig(): String {
 		return """
 		INSERT INTO TunnelConfig (name, wg_quick) VALUES ('test', 'test')
-		"""
+		""".trimIndent()
-            .trimIndent()
 	}
 }

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

@@ -5,24 +5,32 @@ import androidx.room.Delete
 import androidx.room.Insert
 import androidx.room.OnConflictStrategy
 import androidx.room.Query
-import com.zaneschepke.wireguardautotunnel.data.entity.Settings
+import com.zaneschepke.wireguardautotunnel.data.model.Settings
 import kotlinx.coroutines.flow.Flow
 
 @Dao
 interface SettingsDao {
-    @Insert(onConflict = OnConflictStrategy.REPLACE) suspend fun save(t: Settings)
+	@Insert(onConflict = OnConflictStrategy.REPLACE)
+	suspend fun save(t: Settings)
 
-    @Insert(onConflict = OnConflictStrategy.REPLACE) suspend fun saveAll(t: List<Settings>)
+	@Insert(onConflict = OnConflictStrategy.REPLACE)
+	suspend fun saveAll(t: List<Settings>)
 
-    @Query("SELECT * FROM settings WHERE id=:id") suspend fun getById(id: Long): Settings?
+	@Query("SELECT * FROM settings WHERE id=:id")
+	suspend fun getById(id: Long): Settings?
 
-    @Query("SELECT * FROM settings") suspend fun getAll(): List<Settings>
+	@Query("SELECT * FROM settings")
+	suspend fun getAll(): List<Settings>
 
-    @Query("SELECT * FROM settings LIMIT 1") fun getSettingsFlow(): Flow<Settings>
+	@Query("SELECT * FROM settings LIMIT 1")
+	fun getSettingsFlow(): Flow<Settings>
 
-    @Query("SELECT * FROM settings") fun getAllFlow(): Flow<MutableList<Settings>>
+	@Query("SELECT * FROM settings")
+	fun getAllFlow(): Flow<MutableList<Settings>>
 
-    @Delete suspend fun delete(t: Settings)
+	@Delete
+	suspend fun delete(t: Settings)
 
-    @Query("SELECT COUNT('id') FROM settings") suspend fun count(): Long
+	@Query("SELECT COUNT('id') FROM settings")
+	suspend fun count(): Long
 }

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

@@ -5,28 +5,35 @@ import androidx.room.Delete
 import androidx.room.Insert
 import androidx.room.OnConflictStrategy
 import androidx.room.Query
-import com.zaneschepke.wireguardautotunnel.data.entity.TunnelConfig
+import com.zaneschepke.wireguardautotunnel.data.model.TunnelConfig
 import com.zaneschepke.wireguardautotunnel.util.extensions.TunnelConfigs
 import kotlinx.coroutines.flow.Flow
 
 @Dao
 interface TunnelConfigDao {
-    @Insert(onConflict = OnConflictStrategy.REPLACE) suspend fun save(t: TunnelConfig)
+	@Insert(onConflict = OnConflictStrategy.REPLACE)
+	suspend fun save(t: TunnelConfig)
 
-    @Insert(onConflict = OnConflictStrategy.REPLACE) suspend fun saveAll(t: TunnelConfigs)
+	@Insert(onConflict = OnConflictStrategy.REPLACE)
+	suspend fun saveAll(t: TunnelConfigs)
 
-    @Query("SELECT * FROM TunnelConfig WHERE id=:id") suspend fun getById(id: Long): TunnelConfig?
+	@Query("SELECT * FROM TunnelConfig WHERE id=:id")
+	suspend fun getById(id: Long): TunnelConfig?
 
 	@Query("SELECT * FROM TunnelConfig WHERE name=:name")
 	suspend fun getByName(name: String): TunnelConfig?
 
-    @Query("SELECT * FROM TunnelConfig WHERE is_Active=1") suspend fun getActive(): TunnelConfigs
+	@Query("SELECT * FROM TunnelConfig WHERE is_Active=1")
+	suspend fun getActive(): TunnelConfigs
 
-    @Query("SELECT * FROM TunnelConfig") suspend fun getAll(): TunnelConfigs
+	@Query("SELECT * FROM TunnelConfig")
+	suspend fun getAll(): TunnelConfigs
 
-    @Delete suspend fun delete(t: TunnelConfig)
+	@Delete
+	suspend fun delete(t: TunnelConfig)
 
-    @Query("SELECT COUNT('id') FROM TunnelConfig") suspend fun count(): Long
+	@Query("SELECT COUNT('id') FROM TunnelConfig")
+	suspend fun count(): Long
 
 	@Query("SELECT * FROM TunnelConfig WHERE tunnel_networks LIKE '%' || :name || '%'")
 	suspend fun findByTunnelNetworkName(name: String): TunnelConfigs
@@ -46,5 +53,6 @@ interface TunnelConfigDao {
 	@Query("SELECT * FROM TUNNELCONFIG WHERE is_mobile_data_tunnel=1")
 	suspend fun findByMobileDataTunnel(): TunnelConfigs
 
-    @Query("SELECT * FROM tunnelconfig") fun getAllFlow(): Flow<MutableList<TunnelConfig>>
+	@Query("SELECT * FROM tunnelconfig")
+	fun getAllFlow(): Flow<MutableList<TunnelConfig>>
 }

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

@@ -1,10 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.data.entity
-
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
-
-@Serializable
-data class Asset(
-    val name: String,
-    @SerialName("browser_download_url") val browserDownloadUrl: String,
-)

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

@@ -1,24 +0,0 @@
-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

@@ -1,12 +0,0 @@
-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,65 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.data.entity
-
-import androidx.room.ColumnInfo
-import androidx.room.Entity
-import androidx.room.PrimaryKey
-
-@Entity
-data class Settings(
-    @PrimaryKey(autoGenerate = true) val id: Int = 0,
-    @ColumnInfo(name = "is_tunnel_enabled") val isAutoTunnelEnabled: Boolean = false,
-    @ColumnInfo(name = "is_tunnel_on_mobile_data_enabled")
-    val isTunnelOnMobileDataEnabled: Boolean = false,
-    @ColumnInfo(name = "trusted_network_ssids")
-    val trustedNetworkSSIDs: MutableList<String> = mutableListOf(),
-    @ColumnInfo(name = "is_always_on_vpn_enabled") val isAlwaysOnVpnEnabled: Boolean = false,
-    @ColumnInfo(name = "is_tunnel_on_ethernet_enabled")
-    val isTunnelOnEthernetEnabled: Boolean = false,
-    @ColumnInfo(name = "is_shortcuts_enabled", defaultValue = "false")
-    val isShortcutsEnabled: Boolean = false,
-    @ColumnInfo(name = "is_tunnel_on_wifi_enabled", defaultValue = "false")
-    val isTunnelOnWifiEnabled: Boolean = false,
-    @ColumnInfo(name = "is_kernel_enabled", defaultValue = "false")
-    val isKernelEnabled: Boolean = false,
-    @ColumnInfo(name = "is_restore_on_boot_enabled", defaultValue = "false")
-    val isRestoreOnBootEnabled: Boolean = false,
-    @ColumnInfo(name = "is_multi_tunnel_enabled", defaultValue = "false")
-    val isMultiTunnelEnabled: Boolean = false,
-    @ColumnInfo(name = "is_ping_enabled", defaultValue = "false")
-    val isPingEnabled: Boolean = false,
-    @ColumnInfo(name = "is_amnezia_enabled", defaultValue = "false")
-    val isAmneziaEnabled: Boolean = false,
-    @ColumnInfo(name = "is_wildcards_enabled", defaultValue = "false")
-    val isWildcardsEnabled: Boolean = false,
-    @ColumnInfo(name = "is_stop_on_no_internet_enabled", defaultValue = "false")
-    val isStopOnNoInternetEnabled: Boolean = false,
-    @ColumnInfo(name = "is_vpn_kill_switch_enabled", defaultValue = "false")
-    val isVpnKillSwitchEnabled: Boolean = false,
-    @ColumnInfo(name = "is_kernel_kill_switch_enabled", defaultValue = "false")
-    val isKernelKillSwitchEnabled: Boolean = false,
-    @ColumnInfo(name = "is_lan_on_kill_switch_enabled", defaultValue = "false")
-    val isLanOnKillSwitchEnabled: Boolean = false,
-    @ColumnInfo(name = "debounce_delay_seconds", defaultValue = "3")
-    val debounceDelaySeconds: Int = 3,
-    @ColumnInfo(name = "is_disable_kill_switch_on_trusted_enabled", defaultValue = "false")
-    val isDisableKillSwitchOnTrustedEnabled: Boolean = false,
-    @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),
-) {
-
-    enum class WifiDetectionMethod(val value: Int) {
-        DEFAULT(0),
-        LEGACY(1),
-        ROOT(2),
-        SHIZUKU(3);
-
-        companion object {
-            fun fromValue(value: Int): WifiDetectionMethod =
-                entries.find { it.value == value } ?: DEFAULT
-        }
-    }
-}

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

@@ -1,35 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.data.entity
-
-import androidx.room.ColumnInfo
-import androidx.room.Entity
-import androidx.room.Index
-import androidx.room.PrimaryKey
-
-@Entity(indices = [Index(value = ["name"], unique = true)])
-data class TunnelConfig(
-    @PrimaryKey(autoGenerate = true) val id: Int = 0,
-    @ColumnInfo(name = "name") val name: String,
-    @ColumnInfo(name = "wg_quick") val wgQuick: String,
-    @ColumnInfo(name = "tunnel_networks", defaultValue = "")
-    val tunnelNetworks: MutableList<String> = mutableListOf(),
-    @ColumnInfo(name = "is_mobile_data_tunnel", defaultValue = "false")
-    val isMobileDataTunnel: Boolean = false,
-    @ColumnInfo(name = "is_primary_tunnel", defaultValue = "false")
-    val isPrimaryTunnel: Boolean = false,
-    @ColumnInfo(name = "am_quick", defaultValue = "") val amQuick: String = AM_QUICK_DEFAULT,
-    @ColumnInfo(name = "is_Active", defaultValue = "false") val isActive: Boolean = false,
-    @ColumnInfo(name = "is_ping_enabled", defaultValue = "false")
-    val isPingEnabled: Boolean = false,
-    @ColumnInfo(name = "ping_interval", defaultValue = "null") val pingInterval: Long? = null,
-    @ColumnInfo(name = "ping_cooldown", defaultValue = "null") val pingCooldown: Long? = null,
-    @ColumnInfo(name = "ping_ip", defaultValue = "null") var pingIp: String? = null,
-    @ColumnInfo(name = "is_ethernet_tunnel", defaultValue = "false")
-    var isEthernetTunnel: Boolean = false,
-    @ColumnInfo(name = "is_ipv4_preferred", defaultValue = "true")
-    var isIpv4Preferred: Boolean = true,
-) {
-
-    companion object {
-        const val AM_QUICK_DEFAULT = ""
-    }
-}

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

@@ -1,37 +0,0 @@
-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

@@ -1,20 +0,0 @@
-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

@@ -1,67 +0,0 @@
-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

@@ -1,48 +0,0 @@
-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

@@ -0,0 +1,46 @@
+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 isTunnelStatsExpanded: Boolean = IS_TUNNEL_STATS_EXPANDED,
+	val isLocalLogsEnabled: Boolean = IS_LOGS_ENABLED_DEFAULT,
+	val locale: String? = null,
+	val theme: Theme = Theme.AUTOMATIC,
+) {
+
+	fun toAppState(): AppState = AppState(
+		isLocationDisclosureShown,
+		isBatteryOptimizationDisableShown,
+		isPinLockEnabled,
+		isTunnelStatsExpanded,
+		isLocationDisclosureShown,
+		locale,
+		theme,
+	)
+
+	companion object {
+		fun from(appState: AppState): GeneralState {
+			return with(appState) {
+				GeneralState(
+					isLocationDisclosureShown,
+					isBatteryOptimizationDisableShown,
+					isPinLockEnabled,
+					isTunnelStatsExpanded,
+					isLocationDisclosureShown,
+					locale,
+					theme,
+				)
+			}
+		}
+		const val LOCATION_DISCLOSURE_SHOWN_DEFAULT = false
+		const val BATTERY_OPTIMIZATION_DISABLE_SHOWN_DEFAULT = false
+		const val PIN_LOCK_ENABLED_DEFAULT = false
+		const val IS_TUNNEL_STATS_EXPANDED = false
+		const val IS_LOGS_ENABLED_DEFAULT = false
+	}
+}

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

@@ -0,0 +1,118 @@
+package com.zaneschepke.wireguardautotunnel.data.model
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+import com.zaneschepke.wireguardautotunnel.domain.entity.AppSettings
+
+@Entity
+data class Settings(
+	@PrimaryKey(autoGenerate = true) val id: Int = 0,
+	@ColumnInfo(name = "is_tunnel_enabled") val isAutoTunnelEnabled: Boolean = false,
+	@ColumnInfo(name = "is_tunnel_on_mobile_data_enabled")
+	val isTunnelOnMobileDataEnabled: Boolean = false,
+	@ColumnInfo(name = "trusted_network_ssids")
+	val trustedNetworkSSIDs: MutableList<String> = mutableListOf(),
+	@ColumnInfo(name = "is_always_on_vpn_enabled") val isAlwaysOnVpnEnabled: Boolean = false,
+	@ColumnInfo(name = "is_tunnel_on_ethernet_enabled")
+	val isTunnelOnEthernetEnabled: Boolean = false,
+	@ColumnInfo(
+		name = "is_shortcuts_enabled",
+		defaultValue = "false",
+	)
+	val isShortcutsEnabled: Boolean = false,
+	@ColumnInfo(
+		name = "is_tunnel_on_wifi_enabled",
+		defaultValue = "false",
+	)
+	val isTunnelOnWifiEnabled: Boolean = false,
+	@ColumnInfo(
+		name = "is_kernel_enabled",
+		defaultValue = "false",
+	)
+	val isKernelEnabled: Boolean = false,
+	@ColumnInfo(
+		name = "is_restore_on_boot_enabled",
+		defaultValue = "false",
+	)
+	val isRestoreOnBootEnabled: Boolean = false,
+	@ColumnInfo(
+		name = "is_multi_tunnel_enabled",
+		defaultValue = "false",
+	)
+	val isMultiTunnelEnabled: Boolean = false,
+	@ColumnInfo(
+		name = "is_ping_enabled",
+		defaultValue = "false",
+	)
+	val isPingEnabled: Boolean = false,
+	@ColumnInfo(
+		name = "is_amnezia_enabled",
+		defaultValue = "false",
+	)
+	val isAmneziaEnabled: Boolean = false,
+	@ColumnInfo(
+		name = "is_wildcards_enabled",
+		defaultValue = "false",
+	)
+	val isWildcardsEnabled: Boolean = false,
+	@ColumnInfo(
+		name = "is_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",
+	)
+	val isVpnKillSwitchEnabled: Boolean = false,
+	@ColumnInfo(
+		name = "is_kernel_kill_switch_enabled",
+		defaultValue = "false",
+	)
+	val isKernelKillSwitchEnabled: Boolean = false,
+	@ColumnInfo(
+		name = "is_lan_on_kill_switch_enabled",
+		defaultValue = "false",
+	)
+	val isLanOnKillSwitchEnabled: Boolean = false,
+	@ColumnInfo(
+		name = "debounce_delay_seconds",
+		defaultValue = "3",
+	)
+	val debounceDelaySeconds: Int = 3,
+	@ColumnInfo(
+		name = "is_disable_kill_switch_on_trusted_enabled",
+		defaultValue = "false",
+	)
+	val isDisableKillSwitchOnTrustedEnabled: Boolean = false,
+) {
+
+	fun toAppSettings(): AppSettings {
+		return AppSettings(
+			id, isAutoTunnelEnabled, isTunnelOnMobileDataEnabled, trustedNetworkSSIDs, isAlwaysOnVpnEnabled, isTunnelOnEthernetEnabled,
+			isShortcutsEnabled, isTunnelOnWifiEnabled, isKernelEnabled, isRestoreOnBootEnabled, isMultiTunnelEnabled, isPingEnabled,
+			isAmneziaEnabled, isWildcardsEnabled, isWifiNameByShellEnabled, isStopOnNoInternetEnabled, isVpnKillSwitchEnabled,
+			isKernelKillSwitchEnabled, isLanOnKillSwitchEnabled, debounceDelaySeconds, isDisableKillSwitchOnTrustedEnabled,
+		)
+	}
+
+	companion object {
+		fun from(appSettings: AppSettings): Settings {
+			return with(appSettings) {
+				Settings(
+					id, isAutoTunnelEnabled, isTunnelOnMobileDataEnabled, trustedNetworkSSIDs.toMutableList(), isAlwaysOnVpnEnabled,
+					isTunnelOnEthernetEnabled, isShortcutsEnabled, isTunnelOnWifiEnabled, isKernelEnabled, isRestoreOnBootEnabled,
+					isMultiTunnelEnabled, isPingEnabled, isAmneziaEnabled, isWildcardsEnabled, isWifiNameByShellEnabled,
+					isStopOnNoInternetEnabled, isVpnKillSwitchEnabled, isKernelKillSwitchEnabled, isLanOnKillSwitchEnabled,
+					debounceDelaySeconds, isDisableKillSwitchOnTrustedEnabled,
+				)
+			}
+		}
+	}
+}

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

@@ -0,0 +1,93 @@
+package com.zaneschepke.wireguardautotunnel.data.model
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.Index
+import androidx.room.PrimaryKey
+import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
+
+@Entity(indices = [Index(value = ["name"], unique = true)])
+data class TunnelConfig(
+	@PrimaryKey(autoGenerate = true) val id: Int = 0,
+	@ColumnInfo(name = "name") val name: String,
+	@ColumnInfo(name = "wg_quick") val wgQuick: String,
+	@ColumnInfo(
+		name = "tunnel_networks",
+		defaultValue = "",
+	)
+	val tunnelNetworks: MutableList<String> = mutableListOf(),
+	@ColumnInfo(
+		name = "is_mobile_data_tunnel",
+		defaultValue = "false",
+	)
+	val isMobileDataTunnel: Boolean = false,
+	@ColumnInfo(
+		name = "is_primary_tunnel",
+		defaultValue = "false",
+	)
+	val isPrimaryTunnel: Boolean = false,
+	@ColumnInfo(
+		name = "am_quick",
+		defaultValue = "",
+	)
+	val amQuick: String = AM_QUICK_DEFAULT,
+	@ColumnInfo(
+		name = "is_Active",
+		defaultValue = "false",
+	)
+	val isActive: Boolean = false,
+	@ColumnInfo(
+		name = "is_ping_enabled",
+		defaultValue = "false",
+	)
+	val isPingEnabled: Boolean = false,
+	@ColumnInfo(
+		name = "ping_interval",
+		defaultValue = "null",
+	)
+	val pingInterval: Long? = null,
+	@ColumnInfo(
+		name = "ping_cooldown",
+		defaultValue = "null",
+	)
+	val pingCooldown: Long? = null,
+	@ColumnInfo(
+		name = "ping_ip",
+		defaultValue = "null",
+	)
+	var pingIp: String? = null,
+	@ColumnInfo(
+		name = "is_ethernet_tunnel",
+		defaultValue = "false",
+	)
+	var isEthernetTunnel: Boolean = false,
+	@ColumnInfo(
+		name = "is_ipv4_preferred",
+		defaultValue = "true",
+	)
+	var isIpv4Preferred: Boolean = true,
+) {
+
+	fun toTunnel(): TunnelConf {
+		return TunnelConf(
+			id, name, wgQuick, tunnelNetworks, isMobileDataTunnel,
+			isPrimaryTunnel, amQuick, isActive, isPingEnabled, pingInterval,
+			pingCooldown, pingIp, isEthernetTunnel, isIpv4Preferred,
+		)
+	}
+
+	companion object {
+
+		const val AM_QUICK_DEFAULT = ""
+
+		fun from(tunnelConf: TunnelConf): TunnelConfig {
+			return with(tunnelConf) {
+				return TunnelConfig(
+					id, tunName, wgQuick, tunnelNetworks.toMutableList(), isMobileDataTunnel,
+					isPrimaryTunnel, amQuick, isActive, isPingEnabled, pingInterval,
+					pingCooldown, pingIp, isEthernetTunnel, isIpv4Preferred,
+				)
+			}
+		}
+	}
+}

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

@@ -1,9 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.data.network
-
-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/KtorClient.kt

@@ -1,28 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.data.network
-
-import io.ktor.client.HttpClient
-import io.ktor.client.engine.okhttp.OkHttp
-import io.ktor.client.plugins.HttpTimeout
-import io.ktor.client.plugins.contentnegotiation.ContentNegotiation
-import io.ktor.serialization.kotlinx.json.json
-import kotlinx.serialization.json.Json
-
-object KtorClient {
-    fun create(): HttpClient {
-        return HttpClient(OkHttp) {
-            install(ContentNegotiation) {
-                json(
-                    Json {
-                        ignoreUnknownKeys = true
-                        isLenient = true
-                    }
-                )
-            }
-            install(HttpTimeout) {
-                requestTimeoutMillis = 15000
-                connectTimeoutMillis = 15000
-                socketTimeoutMillis = 15000
-            }
-        }
-    }
-}

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

@@ -1,56 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.data.network
-
-import com.zaneschepke.wireguardautotunnel.data.entity.GitHubRelease
-import io.ktor.client.HttpClient
-import io.ktor.client.call.body
-import io.ktor.client.plugins.ClientRequestException
-import io.ktor.client.request.get
-import io.ktor.http.HttpStatusCode
-
-class KtorGitHubApi(private val client: HttpClient) : GitHubApi {
-    override suspend fun getLatestRelease(owner: String, repo: String): Result<GitHubRelease> {
-        return try {
-            val response: GitHubRelease =
-                client.get("https://api.github.com/repos/$owner/$repo/releases/latest").body()
-            Result.success(response)
-        } 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)
-        }
-    }
-
-    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,10 +1,10 @@
 package com.zaneschepke.wireguardautotunnel.data.repository
 
-import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConf
 import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
-import com.zaneschepke.wireguardautotunnel.domain.repository.AppSettingRepository
 import com.zaneschepke.wireguardautotunnel.domain.repository.AppStateRepository
+import com.zaneschepke.wireguardautotunnel.domain.repository.AppSettingRepository
 import com.zaneschepke.wireguardautotunnel.domain.repository.TunnelRepository
+import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
 import javax.inject.Inject
 
 class AppDataRoomRepository

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

@@ -1,16 +1,16 @@
 package com.zaneschepke.wireguardautotunnel.data.repository
 
 import com.zaneschepke.wireguardautotunnel.data.DataStoreManager
-import com.zaneschepke.wireguardautotunnel.data.entity.GeneralState
-import com.zaneschepke.wireguardautotunnel.data.mapper.GeneralStateMapper
-import com.zaneschepke.wireguardautotunnel.domain.model.AppState
 import com.zaneschepke.wireguardautotunnel.domain.repository.AppStateRepository
+import com.zaneschepke.wireguardautotunnel.data.model.GeneralState
 import com.zaneschepke.wireguardautotunnel.ui.theme.Theme
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
 import timber.log.Timber
 
-class DataStoreAppStateRepository(private val dataStoreManager: DataStoreManager) :
+class DataStoreAppStateRepository(
+	private val dataStoreManager: DataStoreManager,
+) :
 	AppStateRepository {
 	override suspend fun isLocationDisclosureShown(): Boolean {
 		return dataStoreManager.getFromStore(DataStoreManager.locationDisclosureShown)
@@ -39,36 +39,13 @@ class DataStoreAppStateRepository(private val dataStoreManager: DataStoreManager
 		dataStoreManager.saveToDataStore(DataStoreManager.batteryDisableShown, shown)
 	}
 
-    override suspend fun setTunnelExpanded(id: Int) {
+	override suspend fun isTunnelStatsExpanded(): Boolean {
-        val ids =
+		return dataStoreManager.getFromStore(DataStoreManager.tunnelStatsExpanded)
-            dataStoreManager
+			?: GeneralState.IS_TUNNEL_STATS_EXPANDED
-                .getFromStore(DataStoreManager.expandedTunnelIds)
-                ?.split(",")
-                ?.mapNotNull { it.toIntOrNull() } ?: emptyList()
-
-        if (ids.contains(id)) return
-
-        val updatedList = ids.toMutableList().apply { add(id) }
-        dataStoreManager.saveToDataStore(
-            DataStoreManager.expandedTunnelIds,
-            updatedList.joinToString(","),
-        )
 	}
 
-    override suspend fun removeTunnelExpanded(id: Int) {
+	override suspend fun setTunnelStatsExpanded(expanded: Boolean) {
-        val ids =
+		dataStoreManager.saveToDataStore(DataStoreManager.tunnelStatsExpanded, expanded)
-            dataStoreManager
-                .getFromStore(DataStoreManager.expandedTunnelIds)
-                ?.split(",")
-                ?.mapNotNull { it.toIntOrNull() } ?: emptyList()
-
-        if (ids.isEmpty() || !ids.contains(id)) return
-
-        val updatedList = ids.toMutableList().apply { remove(id) }
-        dataStoreManager.saveToDataStore(
-            DataStoreManager.expandedTunnelIds,
-            updatedList.joinToString(","),
-        )
 	}
 
 	override suspend fun setTheme(theme: Theme) {
@@ -86,8 +63,7 @@ class DataStoreAppStateRepository(private val dataStoreManager: DataStoreManager
 	}
 
 	override suspend fun isLocalLogsEnabled(): Boolean {
-        return dataStoreManager.getFromStore(DataStoreManager.isLocalLogsEnabled)
+		return dataStoreManager.getFromStore(DataStoreManager.isLocalLogsEnabled) ?: GeneralState.IS_LOGS_ENABLED_DEFAULT
-            ?: GeneralState.IS_LOGS_ENABLED_DEFAULT
 	}
 
 	override suspend fun setLocalLogsEnabled(enabled: Boolean) {
@@ -102,26 +78,8 @@ class DataStoreAppStateRepository(private val dataStoreManager: DataStoreManager
 		return dataStoreManager.getFromStore(DataStoreManager.locale)
 	}
 
-    override suspend fun setIsRemoteControlEnabled(enabled: Boolean) {
+	override val flow: Flow<GeneralState> =
-        dataStoreManager.saveToDataStore(DataStoreManager.isRemoteControlEnabled, enabled)
+		dataStoreManager.preferencesFlow.map { prefs ->
-    }
-
-    override suspend fun isRemoteControlEnabled(): Boolean {
-        return dataStoreManager.getFromStore(DataStoreManager.isRemoteControlEnabled)
-            ?: GeneralState.IS_REMOTE_CONTROL_ENABLED
-    }
-
-    override suspend fun setRemoteKey(key: String) {
-        dataStoreManager.saveToDataStore(DataStoreManager.remoteKey, key)
-    }
-
-    override suspend fun getRemoteKey(): String? {
-        return dataStoreManager.getFromStore(DataStoreManager.remoteKey)
-    }
-
-    override val flow: Flow<AppState> =
-        dataStoreManager.preferencesFlow
-            .map { prefs ->
 			prefs?.let { pref ->
 				try {
 					GeneralState(
@@ -134,17 +92,8 @@ class DataStoreAppStateRepository(private val dataStoreManager: DataStoreManager
 						isPinLockEnabled =
 						pref[DataStoreManager.pinLockEnabled]
 							?: GeneralState.PIN_LOCK_ENABLED_DEFAULT,
-                            expandedTunnelIds =
+						isTunnelStatsExpanded = pref[DataStoreManager.tunnelStatsExpanded] ?: GeneralState.IS_TUNNEL_STATS_EXPANDED,
-                                pref[DataStoreManager.expandedTunnelIds]?.split(",")?.mapNotNull {
+						isLocalLogsEnabled = pref[DataStoreManager.isLocalLogsEnabled] ?: GeneralState.IS_LOGS_ENABLED_DEFAULT,
-                                    it.toIntOrNull()
-                                } ?: emptyList(),
-                            isLocalLogsEnabled =
-                                pref[DataStoreManager.isLocalLogsEnabled]
-                                    ?: GeneralState.IS_LOGS_ENABLED_DEFAULT,
-                            isRemoteControlEnabled =
-                                pref[DataStoreManager.isRemoteControlEnabled]
-                                    ?: GeneralState.IS_REMOTE_CONTROL_ENABLED,
-                            remoteKey = pref[DataStoreManager.remoteKey],
 						locale = pref[DataStoreManager.locale],
 						theme = getTheme(),
 					)
@@ -154,5 +103,4 @@ class DataStoreAppStateRepository(private val dataStoreManager: DataStoreManager
 				}
 			} ?: GeneralState()
 		}
-            .map(GeneralStateMapper::toAppState)
 }

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

@@ -1,106 +0,0 @@
-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.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
-import io.ktor.client.statement.HttpResponse
-import io.ktor.client.statement.bodyAsChannel
-import io.ktor.http.contentLength
-import io.ktor.utils.io.ByteReadChannel
-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,
-    private val httpClient: HttpClient,
-    private val githubOwner: String,
-    private val githubRepo: String,
-    private val context: Context,
-    @IoDispatcher private val ioDispatcher: CoroutineDispatcher,
-) : UpdateRepository {
-    override suspend fun checkForUpdate(currentVersion: String): Result<AppUpdate?> =
-        withContext(ioDispatcher) {
-            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
-                }
-            }
-        }
-
-    override suspend fun downloadApk(
-        apkUrl: String,
-        fileName: String,
-        onProgress: (Float) -> Unit,
-    ): Result<File> =
-        withContext(ioDispatcher) {
-            try {
-                // clean up old files
-                context.getExternalFilesDir(null)?.listFiles()?.forEach { file ->
-                    if (file.extension == "apk") file.delete()
-                }
-
-                val response: HttpResponse = httpClient.get(apkUrl)
-
-                val apkFile = File(context.getExternalFilesDir(null), fileName)
-
-                val channel: ByteReadChannel = response.bodyAsChannel()
-                val totalBytes: Long = response.contentLength() ?: -1L
-                var bytesCopied = 0L
-
-                apkFile.outputStream().use { output ->
-                    val buffer = ByteArray(8 * 1024)
-
-                    while (!channel.isClosedForRead) {
-                        val bytesRead = channel.readAvailable(buffer)
-                        if (bytesRead <= 0) break
-                        output.write(buffer, 0, bytesRead)
-                        bytesCopied += bytesRead
-
-                        if (totalBytes > 0) {
-                            val progress = bytesCopied.toFloat() / totalBytes
-                            onProgress(progress.coerceIn(0f, 1f))
-                        }
-                    }
-                }
-
-                Result.success(apkFile)
-            } catch (e: Exception) {
-                Result.failure(e)
-            }
-        }
-}

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

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

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

@@ -1,10 +1,10 @@
 package com.zaneschepke.wireguardautotunnel.data.repository
 
 import com.zaneschepke.wireguardautotunnel.data.dao.TunnelConfigDao
-import com.zaneschepke.wireguardautotunnel.data.mapper.TunnelConfigMapper
-import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
-import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConf
 import com.zaneschepke.wireguardautotunnel.domain.repository.TunnelRepository
+import com.zaneschepke.wireguardautotunnel.data.model.TunnelConfig
+import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
+import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
 import com.zaneschepke.wireguardautotunnel.util.extensions.Tunnels
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.flow.flowOn
@@ -16,65 +16,72 @@ class RoomTunnelRepository(
 	@IoDispatcher private val ioDispatcher: CoroutineDispatcher,
 ) : TunnelRepository {
 
-    override val flow =
+	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(TunnelConfigMapper::toTunnelConf)
+			tunnelConfigDao.getAll().map { it.toTunnel() }
 		}
 	}
 
 	override suspend fun save(tunnelConf: TunnelConf) {
 		withContext(ioDispatcher) {
-            tunnelConfigDao.save(TunnelConfigMapper.toTunnelConfig(tunnelConf))
+			tunnelConfigDao.save(TunnelConfig.from(tunnelConf))
-        }
-    }
-
-    override suspend fun saveAll(tunnelConfList: List<TunnelConf>) {
-        withContext(ioDispatcher) {
-            tunnelConfigDao.saveAll(tunnelConfList.map(TunnelConfigMapper::toTunnelConfig))
 		}
 	}
 
 	override suspend fun updatePrimaryTunnel(tunnelConf: TunnelConf?) {
 		withContext(ioDispatcher) {
 			tunnelConfigDao.resetPrimaryTunnel()
-            tunnelConf?.let { save(it.copy(isPrimaryTunnel = true)) }
+			tunnelConf?.let {
+				save(
+					it.copy(
+						isPrimaryTunnel = true,
+					),
+				)
+			}
 		}
 	}
 
 	override suspend fun updateMobileDataTunnel(tunnelConf: TunnelConf?) {
 		withContext(ioDispatcher) {
 			tunnelConfigDao.resetMobileDataTunnel()
-            tunnelConf?.let { save(it.copy(isMobileDataTunnel = true)) }
+			tunnelConf?.let {
+				save(
+					it.copy(
+						isMobileDataTunnel = true,
+					),
+				)
+			}
 		}
 	}
 
 	override suspend fun updateEthernetTunnel(tunnelConf: TunnelConf?) {
 		withContext(ioDispatcher) {
 			tunnelConfigDao.resetEthernetTunnel()
-            tunnelConf?.let { save(it.copy(isEthernetTunnel = true)) }
+			tunnelConf?.let {
+				save(
+					it.copy(
+						isEthernetTunnel = true,
+					),
+				)
+			}
 		}
 	}
 
 	override suspend fun delete(tunnelConf: TunnelConf) {
 		withContext(ioDispatcher) {
-            tunnelConfigDao.delete(TunnelConfigMapper.toTunnelConfig(tunnelConf))
+			tunnelConfigDao.delete(TunnelConfig.from(tunnelConf))
 		}
 	}
 
 	override suspend fun getById(id: Int): TunnelConf? {
-        return withContext(ioDispatcher) {
+		return withContext(ioDispatcher) { tunnelConfigDao.getById(id.toLong())?.toTunnel() }
-            tunnelConfigDao.getById(id.toLong())?.let(TunnelConfigMapper::toTunnelConf)
-        }
 	}
 
 	override suspend fun getActive(): Tunnels {
 		return withContext(ioDispatcher) {
-            tunnelConfigDao.getActive().map(TunnelConfigMapper::toTunnelConf)
+			tunnelConfigDao.getActive().map { it.toTunnel() }
 		}
 	}
 
@@ -83,26 +90,18 @@ class RoomTunnelRepository(
 	}
 
 	override suspend fun findByTunnelName(name: String): TunnelConf? {
-        return withContext(ioDispatcher) {
+		return withContext(ioDispatcher) { tunnelConfigDao.getByName(name)?.toTunnel() }
-            tunnelConfigDao.getByName(name)?.let(TunnelConfigMapper::toTunnelConf)
-        }
 	}
 
 	override suspend fun findByTunnelNetworksName(name: String): Tunnels {
-        return withContext(ioDispatcher) {
+		return withContext(ioDispatcher) { tunnelConfigDao.findByTunnelNetworkName(name).map { it.toTunnel() } }
-            tunnelConfigDao.findByTunnelNetworkName(name).map(TunnelConfigMapper::toTunnelConf)
-        }
 	}
 
 	override suspend fun findByMobileDataTunnel(): Tunnels {
-        return withContext(ioDispatcher) {
+		return withContext(ioDispatcher) { tunnelConfigDao.findByMobileDataTunnel().map { it.toTunnel() } }
-            tunnelConfigDao.findByMobileDataTunnel().map(TunnelConfigMapper::toTunnelConf)
-        }
 	}
 
 	override suspend fun findPrimary(): Tunnels {
-        return withContext(ioDispatcher) {
+		return withContext(ioDispatcher) { tunnelConfigDao.findByPrimary().map { it.toTunnel() } }
-            tunnelConfigDao.findByPrimary().map(TunnelConfigMapper::toTunnelConf)
-        }
 	}
 }

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

@@ -12,10 +12,10 @@ import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.android.qualifiers.ApplicationContext
 import dagger.hilt.components.SingletonComponent
-import javax.inject.Singleton
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.SupervisorJob
+import javax.inject.Singleton
 
 @Module
 @InstallIn(SingletonComponent::class)
@@ -23,9 +23,8 @@ class AppModule {
 	@Singleton
 	@ApplicationScope
 	@Provides
-    fun providesApplicationScope(
+	fun providesApplicationScope(@DefaultDispatcher defaultDispatcher: CoroutineDispatcher): CoroutineScope =
-        @DefaultDispatcher defaultDispatcher: CoroutineDispatcher
+		CoroutineScope(SupervisorJob() + defaultDispatcher)
-    ): CoroutineScope = CoroutineScope(SupervisorJob() + defaultDispatcher)
 
 	@Singleton
 	@Provides
@@ -41,10 +40,7 @@ class AppModule {
 
 	@Singleton
 	@Provides
-    fun provideShortcutManager(
+	fun provideShortcutManager(@ApplicationContext context: Context, @IoDispatcher ioDispatcher: CoroutineDispatcher): ShortcutManager {
-        @ApplicationContext context: Context,
-        @IoDispatcher ioDispatcher: CoroutineDispatcher,
-    ): ShortcutManager {
 		return DynamicShortcutManager(context, ioDispatcher)
 	}
 }

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

@@ -2,10 +2,18 @@ package com.zaneschepke.wireguardautotunnel.di
 
 import javax.inject.Qualifier
 
-@Qualifier @Retention(AnnotationRetention.BINARY) annotation class TunnelShell
+@Qualifier
+@Retention(AnnotationRetention.BINARY)
+annotation class TunnelShell
 
-@Qualifier @Retention(AnnotationRetention.BINARY) annotation class AppShell
+@Qualifier
+@Retention(AnnotationRetention.BINARY)
+annotation class AppShell
 
-@Qualifier @Retention(AnnotationRetention.BINARY) annotation class Kernel
+@Qualifier
+@Retention(AnnotationRetention.BINARY)
+annotation class Kernel
 
-@Qualifier @Retention(AnnotationRetention.BINARY) annotation class Userspace
+@Qualifier
+@Retention(AnnotationRetention.BINARY)
+annotation class Userspace

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

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

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

@@ -14,9 +14,13 @@ object CoroutinesDispatchersModule {
 	@Provides
 	fun providesDefaultDispatcher(): CoroutineDispatcher = Dispatchers.Default
 
-    @IoDispatcher @Provides fun providesIoDispatcher(): CoroutineDispatcher = Dispatchers.IO
+	@IoDispatcher
+	@Provides
+	fun providesIoDispatcher(): CoroutineDispatcher = Dispatchers.IO
 
-    @MainDispatcher @Provides fun providesMainDispatcher(): CoroutineDispatcher = Dispatchers.Main
+	@MainDispatcher
+	@Provides
+	fun providesMainDispatcher(): CoroutineDispatcher = Dispatchers.Main
 
 	@MainImmediateDispatcher
 	@Provides

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

@@ -4,31 +4,25 @@ import android.content.Context
 import androidx.room.Room
 import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.data.AppDatabase
-import com.zaneschepke.wireguardautotunnel.data.DataStoreManager
 import com.zaneschepke.wireguardautotunnel.data.DatabaseCallback
 import com.zaneschepke.wireguardautotunnel.data.dao.SettingsDao
 import com.zaneschepke.wireguardautotunnel.data.dao.TunnelConfigDao
-import com.zaneschepke.wireguardautotunnel.data.network.GitHubApi
+import com.zaneschepke.wireguardautotunnel.data.DataStoreManager
-import com.zaneschepke.wireguardautotunnel.data.network.KtorClient
+import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
-import com.zaneschepke.wireguardautotunnel.data.network.KtorGitHubApi
 import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRoomRepository
+import com.zaneschepke.wireguardautotunnel.domain.repository.AppStateRepository
 import com.zaneschepke.wireguardautotunnel.data.repository.DataStoreAppStateRepository
-import com.zaneschepke.wireguardautotunnel.data.repository.GitHubUpdateRepository
 import com.zaneschepke.wireguardautotunnel.data.repository.RoomSettingsRepository
 import com.zaneschepke.wireguardautotunnel.data.repository.RoomTunnelRepository
-import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
 import com.zaneschepke.wireguardautotunnel.domain.repository.AppSettingRepository
-import com.zaneschepke.wireguardautotunnel.domain.repository.AppStateRepository
 import com.zaneschepke.wireguardautotunnel.domain.repository.TunnelRepository
-import com.zaneschepke.wireguardautotunnel.domain.repository.UpdateRepository
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.android.qualifiers.ApplicationContext
 import dagger.hilt.components.SingletonComponent
-import io.ktor.client.HttpClient
-import javax.inject.Singleton
 import kotlinx.coroutines.CoroutineDispatcher
+import javax.inject.Singleton
 
 @Module
 @InstallIn(SingletonComponent::class)
@@ -41,7 +35,7 @@ class RepositoryModule {
 			AppDatabase::class.java,
 			context.getString(R.string.db_name),
 		)
-            .fallbackToDestructiveMigration(true)
+			.fallbackToDestructiveMigration()
 			.addCallback(DatabaseCallback())
 			.build()
 	}
@@ -60,28 +54,19 @@ class RepositoryModule {
 
 	@Singleton
 	@Provides
-    fun provideTunnelConfigRepository(
+	fun provideTunnelConfigRepository(tunnelConfigDao: TunnelConfigDao, @IoDispatcher ioDispatcher: CoroutineDispatcher): TunnelRepository {
-        tunnelConfigDao: TunnelConfigDao,
-        @IoDispatcher ioDispatcher: CoroutineDispatcher,
-    ): TunnelRepository {
 		return RoomTunnelRepository(tunnelConfigDao, ioDispatcher)
 	}
 
 	@Singleton
 	@Provides
-    fun provideSettingsRepository(
+	fun provideSettingsRepository(settingsDao: SettingsDao, @IoDispatcher ioDispatcher: CoroutineDispatcher): AppSettingRepository {
-        settingsDao: SettingsDao,
-        @IoDispatcher ioDispatcher: CoroutineDispatcher,
-    ): AppSettingRepository {
 		return RoomSettingsRepository(settingsDao, ioDispatcher)
 	}
 
 	@Singleton
 	@Provides
-    fun providePreferencesDataStore(
+	fun providePreferencesDataStore(@ApplicationContext context: Context, @IoDispatcher ioDispatcher: CoroutineDispatcher): DataStoreManager {
-        @ApplicationContext context: Context,
-        @IoDispatcher ioDispatcher: CoroutineDispatcher,
-    ): DataStoreManager {
 		return DataStoreManager(context, ioDispatcher)
 	}
 
@@ -100,34 +85,4 @@ class RepositoryModule {
 	): AppDataRepository {
 		return AppDataRoomRepository(settingsRepository, tunnelRepository, appStateRepository)
 	}
-
-    @Provides
-    @Singleton
-    fun provideHttpClient(): HttpClient {
-        return KtorClient.create()
-    }
-
-    @Provides
-    @Singleton
-    fun provideGitHubApi(client: HttpClient): GitHubApi {
-        return KtorGitHubApi(client)
-    }
-
-    @Provides
-    @Singleton
-    fun provideUpdateRepository(
-        gitHubApi: GitHubApi,
-        client: HttpClient,
-        @IoDispatcher ioDispatcher: CoroutineDispatcher,
-        @ApplicationContext context: Context,
-    ): UpdateRepository {
-        return GitHubUpdateRepository(
-            gitHubApi,
-            client,
-            "wgtunnel",
-            "wgtunnel",
-            context,
-            ioDispatcher,
-        )
-    }
 }

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

@@ -0,0 +1,16 @@
+package com.zaneschepke.wireguardautotunnel.di
+
+import com.zaneschepke.wireguardautotunnel.core.network.InternetConnectivityMonitor
+import com.zaneschepke.wireguardautotunnel.core.network.NetworkMonitor
+import dagger.Binds
+import dagger.Module
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+
+@Module
+@InstallIn(SingletonComponent::class)
+abstract class ServiceModule {
+
+	@Binds
+	abstract fun provideInternetConnectivityService(wifiService: InternetConnectivityMonitor): NetworkMonitor
+}

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

@@ -4,27 +4,25 @@ import android.content.Context
 import com.wireguard.android.backend.WgQuickBackend
 import com.wireguard.android.util.RootShell
 import com.wireguard.android.util.ToolsInstaller
-import com.zaneschepke.networkmonitor.AndroidNetworkMonitor
+import com.zaneschepke.wireguardautotunnel.core.network.NetworkMonitor
-import com.zaneschepke.networkmonitor.NetworkMonitor
+import com.zaneschepke.wireguardautotunnel.core.notification.NotificationManager
 import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
 import com.zaneschepke.wireguardautotunnel.core.tunnel.KernelTunnel
 import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelManager
 import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelProvider
 import com.zaneschepke.wireguardautotunnel.core.tunnel.UserspaceTunnel
 import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
-import com.zaneschepke.wireguardautotunnel.domain.repository.AppSettingRepository
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.android.qualifiers.ApplicationContext
 import dagger.hilt.components.SingletonComponent
-import javax.inject.Singleton
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.runBlocking
 import org.amnezia.awg.backend.Backend
 import org.amnezia.awg.backend.GoBackend
 import org.amnezia.awg.backend.RootTunnelActionHandler
+import javax.inject.Singleton
 
 @Module
 @InstallIn(SingletonComponent::class)
@@ -52,41 +50,40 @@ class TunnelModule {
 
 	@Provides
 	@Singleton
-    fun provideKernelBackend(
+	fun provideKernelBackend(@ApplicationContext context: Context, @TunnelShell shell: RootShell): com.wireguard.android.backend.Backend {
-        @ApplicationContext context: Context,
+		return WgQuickBackend(context, shell, ToolsInstaller(context, shell), com.wireguard.android.backend.RootTunnelActionHandler(shell)).also {
-        @TunnelShell shell: RootShell,
+			it.setMultipleTunnels(true)
-    ): com.wireguard.android.backend.Backend {
+		}
-        return WgQuickBackend(
-                context,
-                shell,
-                ToolsInstaller(context, shell),
-                com.wireguard.android.backend.RootTunnelActionHandler(shell),
-            )
-            .also { it.setMultipleTunnels(true) }
 	}
 
 	@Provides
 	@Singleton
 	@Kernel
 	fun provideKernelProvider(
+		@IoDispatcher ioDispatcher: CoroutineDispatcher,
 		@ApplicationScope applicationScope: CoroutineScope,
 		serviceManager: ServiceManager,
 		appDataRepository: AppDataRepository,
+		networkMonitor: NetworkMonitor,
+		notificationManager: NotificationManager,
 		backend: com.wireguard.android.backend.Backend,
 	): TunnelProvider {
-        return KernelTunnel(applicationScope, serviceManager, appDataRepository, backend)
+		return KernelTunnel(ioDispatcher, applicationScope, serviceManager, appDataRepository, notificationManager, backend, networkMonitor)
 	}
 
 	@Provides
 	@Singleton
 	@Userspace
 	fun provideUserspaceProvider(
+		@IoDispatcher ioDispatcher: CoroutineDispatcher,
 		@ApplicationScope applicationScope: CoroutineScope,
 		serviceManager: ServiceManager,
 		appDataRepository: AppDataRepository,
+		notificationManager: NotificationManager,
+		networkMonitor: NetworkMonitor,
 		backend: Backend,
 	): TunnelProvider {
-        return UserspaceTunnel(applicationScope, serviceManager, appDataRepository, backend)
+		return UserspaceTunnel(ioDispatcher, applicationScope, serviceManager, appDataRepository, notificationManager, backend, networkMonitor)
 	}
 
 	@Provides
@@ -98,26 +95,7 @@ class TunnelModule {
 		@IoDispatcher ioDispatcher: CoroutineDispatcher,
 		@ApplicationScope applicationScope: CoroutineScope,
 	): TunnelManager {
-        return TunnelManager(
+		return TunnelManager(kernelTunnel, userspaceTunnel, appDataRepository, applicationScope, ioDispatcher)
-            kernelTunnel,
-            userspaceTunnel,
-            appDataRepository,
-            applicationScope,
-            ioDispatcher,
-        )
-    }
-
-    @Provides
-    @Singleton
-    fun provideNetworkMonitor(
-        @ApplicationContext context: Context,
-        settingsRepository: AppSettingRepository,
-    ): NetworkMonitor {
-        val method = runBlocking { settingsRepository.get().wifiDetectionMethod }
-        return AndroidNetworkMonitor(
-            context,
-            AndroidNetworkMonitor.WifiDetectionMethod.fromValue(method.value),
-        )
 	}
 
 	@Singleton
@@ -125,16 +103,8 @@ class TunnelModule {
 	fun provideServiceManager(
 		@ApplicationContext context: Context,
 		@IoDispatcher ioDispatcher: CoroutineDispatcher,
-        @MainDispatcher mainCoroutineDispatcher: CoroutineDispatcher,
-        @ApplicationScope applicationScope: CoroutineScope,
 		appDataRepository: AppDataRepository,
 	): ServiceManager {
-        return ServiceManager(
+		return ServiceManager(context, ioDispatcher, appDataRepository)
-            context,
-            ioDispatcher,
-            applicationScope,
-            mainCoroutineDispatcher,
-            appDataRepository,
-        )
 	}
 }

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

@@ -15,10 +15,7 @@ import kotlinx.coroutines.CoroutineDispatcher
 class ViewModelModule {
 	@ViewModelScoped
 	@Provides
-    fun provideFileUtils(
+	fun provideFileUtils(@ApplicationContext context: Context, @IoDispatcher ioDispatcher: CoroutineDispatcher): FileUtils {
-        @ApplicationContext context: Context,
-        @IoDispatcher ioDispatcher: CoroutineDispatcher,
-    ): FileUtils {
 		return FileUtils(context, ioDispatcher)
 	}
 }

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

@@ -0,0 +1,29 @@
+package com.zaneschepke.wireguardautotunnel.domain.entity
+
+data class AppSettings(
+	val id: Int = 0,
+	val isAutoTunnelEnabled: Boolean = false,
+	val isTunnelOnMobileDataEnabled: Boolean = false,
+	val trustedNetworkSSIDs: List<String> = emptyList(),
+	val isAlwaysOnVpnEnabled: Boolean = false,
+	val isTunnelOnEthernetEnabled: Boolean = false,
+	val isShortcutsEnabled: Boolean = false,
+	val isTunnelOnWifiEnabled: Boolean = false,
+	val isKernelEnabled: Boolean = false,
+	val isRestoreOnBootEnabled: Boolean = false,
+	val isMultiTunnelEnabled: Boolean = false,
+	val isPingEnabled: Boolean = false,
+	val isAmneziaEnabled: Boolean = false,
+	val isWildcardsEnabled: Boolean = false,
+	val isWifiNameByShellEnabled: Boolean = false,
+	val isStopOnNoInternetEnabled: Boolean = false,
+	val isVpnKillSwitchEnabled: Boolean = false,
+	val isKernelKillSwitchEnabled: Boolean = false,
+	val isLanOnKillSwitchEnabled: Boolean = false,
+	val debounceDelaySeconds: Int = 3,
+	val isDisableKillSwitchOnTrustedEnabled: Boolean = false,
+) {
+	fun debounceDelayMillis(): Long {
+		return debounceDelaySeconds * 1000L
+	}
+}

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

@@ -0,0 +1,13 @@
+package com.zaneschepke.wireguardautotunnel.domain.entity
+
+import com.zaneschepke.wireguardautotunnel.ui.theme.Theme
+
+data class AppState(
+	val isLocationDisclosureShown: Boolean,
+	val isBatteryOptimizationDisableShown: Boolean,
+	val isPinLockEnabled: Boolean,
+	val isTunnelStatsExpanded: Boolean,
+	val isLocalLogsEnabled: Boolean,
+	val locale: String?,
+	val theme: Theme,
+)

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

@@ -0,0 +1,126 @@
+package com.zaneschepke.wireguardautotunnel.domain.entity
+
+import com.wireguard.config.Config
+import com.zaneschepke.wireguardautotunnel.domain.state.TunnelState
+import com.zaneschepke.wireguardautotunnel.util.Constants
+import com.zaneschepke.wireguardautotunnel.util.extensions.asTunnelState
+import com.zaneschepke.wireguardautotunnel.util.extensions.isReachable
+import com.zaneschepke.wireguardautotunnel.util.extensions.toWgQuickString
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.withContext
+import org.amnezia.awg.backend.Tunnel
+import timber.log.Timber
+import java.io.InputStream
+import java.net.InetAddress
+import kotlin.coroutines.CoroutineContext
+
+data class TunnelConf(
+	val id: Int = 0,
+	val tunName: String,
+	val wgQuick: String,
+	val tunnelNetworks: List<String> = emptyList(),
+	val isMobileDataTunnel: Boolean = false,
+	val isPrimaryTunnel: Boolean = false,
+	val amQuick: String,
+	val isActive: Boolean = false,
+	val isPingEnabled: Boolean = false,
+	val pingInterval: Long? = null,
+	val pingCooldown: Long? = null,
+	val pingIp: String? = null,
+	val isEthernetTunnel: Boolean = false,
+	val isIpv4Preferred: Boolean = false,
+) : Tunnel, com.wireguard.android.backend.Tunnel {
+
+	val state = MutableStateFlow(TunnelState())
+
+	fun toAmConfig(): org.amnezia.awg.config.Config {
+		return configFromAmQuick(amQuick.ifBlank { wgQuick })
+	}
+
+	fun toWgConfig(): Config {
+		return configFromWgQuick(wgQuick)
+	}
+
+	override fun getName(): String {
+		return tunName
+	}
+
+	override fun isIpv4ResolutionPreferred(): Boolean {
+		return isIpv4Preferred
+	}
+
+	override fun onStateChange(newState: Tunnel.State) {
+		state.update {
+			it.copy(state = newState.asTunnelState())
+		}
+	}
+
+	override fun onStateChange(newState: com.wireguard.android.backend.Tunnel.State) {
+		state.update {
+			it.copy(state = newState.asTunnelState())
+		}
+	}
+
+	fun isQuickConfigChanged(updatedConf: TunnelConf): Boolean {
+		return updatedConf.wgQuick != wgQuick ||
+			updatedConf.amQuick != amQuick
+	}
+
+	fun isPingConfigMatching(updatedConf: TunnelConf): Boolean {
+		return updatedConf.isPingEnabled == isPingEnabled &&
+			pingIp == updatedConf.pingIp &&
+			updatedConf.pingCooldown == pingCooldown &&
+			updatedConf.pingInterval == pingInterval
+	}
+
+	suspend fun pingTunnel(context: CoroutineContext): List<Boolean> {
+		return withContext(context) {
+			val config = toWgConfig()
+			if (pingIp != null) {
+				Timber.i("Pinging custom ip")
+				listOf(InetAddress.getByName(pingIp).isReachable(Constants.PING_TIMEOUT.toInt()))
+			} else {
+				Timber.i("Pinging all peers")
+				config.peers.map { peer ->
+					peer.isReachable(isIpv4Preferred)
+				}
+			}
+		}
+	}
+
+	companion object {
+		fun configFromWgQuick(wgQuick: String): Config {
+			val inputStream: InputStream = wgQuick.byteInputStream()
+			return inputStream.bufferedReader(Charsets.UTF_8).use {
+				Config.parse(it)
+			}
+		}
+
+		fun configFromAmQuick(amQuick: String): org.amnezia.awg.config.Config {
+			val inputStream: InputStream = amQuick.byteInputStream()
+			return inputStream.bufferedReader(Charsets.UTF_8).use {
+				org.amnezia.awg.config.Config.parse(it)
+			}
+		}
+
+		fun tunnelConfigFromAmConfig(config: org.amnezia.awg.config.Config, name: String): TunnelConf {
+			val amQuick = config.toAwgQuickString(true)
+			val wgQuick = config.toWgQuickString()
+			return TunnelConf(tunName = name, wgQuick = wgQuick, amQuick = amQuick)
+		}
+
+		private const val IPV6_ALL_NETWORKS = "::/0"
+		private const val IPV4_ALL_NETWORKS = "0.0.0.0/0"
+		val ALL_IPS = listOf(IPV4_ALL_NETWORKS, IPV6_ALL_NETWORKS)
+		private val IPV4_PUBLIC_NETWORKS = listOf(
+			"0.0.0.0/5", "8.0.0.0/7", "11.0.0.0/8", "12.0.0.0/6", "16.0.0.0/4", "32.0.0.0/3",
+			"64.0.0.0/2", "128.0.0.0/3", "160.0.0.0/5", "168.0.0.0/6", "172.0.0.0/12",
+			"172.32.0.0/11", "172.64.0.0/10", "172.128.0.0/9", "173.0.0.0/8", "174.0.0.0/7",
+			"176.0.0.0/4", "192.0.0.0/9", "192.128.0.0/11", "192.160.0.0/13", "192.169.0.0/16",
+			"192.170.0.0/15", "192.172.0.0/14", "192.176.0.0/12", "192.192.0.0/10",
+			"193.0.0.0/8", "194.0.0.0/7", "196.0.0.0/6", "200.0.0.0/5", "208.0.0.0/4",
+		)
+		val LAN_BYPASS_ALLOWED_IPS = listOf(IPV6_ALL_NETWORKS) + IPV4_PUBLIC_NETWORKS
+	}
+}

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

@@ -1,33 +1,7 @@
 package com.zaneschepke.wireguardautotunnel.domain.enums
 
-import com.zaneschepke.wireguardautotunnel.R
+sealed class BackendError() {
-
-sealed class BackendError : Exception() {
 	data object DNS : BackendError()
-
 	data object Unauthorized : BackendError()
-
 	data object Config : BackendError()
-
-    data object KernelModuleName : BackendError()
-
-    data object InvalidConfig : BackendError()
-
-    data object NotAuthorized : BackendError()
-
-    data object ServiceNotRunning : BackendError()
-
-    data object Unknown : BackendError()
-
-    fun toStringRes() =
-        when (this) {
-            Config -> R.string.config_error
-            DNS -> R.string.dns_resolve_error
-            InvalidConfig -> R.string.invalid_config_error
-            KernelModuleName -> R.string.kernel_name_error
-            NotAuthorized,
-            Unauthorized -> R.string.auth_error
-            ServiceNotRunning -> R.string.service_running_error
-            Unknown -> R.string.unknown_error
-        }
 }

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

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

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

@@ -4,7 +4,8 @@ enum class HandshakeStatus {
 	HEALTHY,
 	STALE,
 	UNKNOWN,
-    NOT_STARTED;
+	NOT_STARTED,
+	;
 
 	companion object {
 		private const val WG_TYPICAL_HANDSHAKE_INTERVAL_WHEN_HEALTHY_SEC = 180

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

@@ -5,7 +5,8 @@ import com.zaneschepke.wireguardautotunnel.R
 
 enum class NotificationAction {
 	TUNNEL_OFF,
-    AUTO_TUNNEL_OFF;
+	AUTO_TUNNEL_OFF,
+	;
 
 	fun title(context: Context): String {
 		return when (this) {

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

@@ -1,34 +1,15 @@
 package com.zaneschepke.wireguardautotunnel.domain.enums
 
-sealed class TunnelStatus {
+enum class TunnelStatus {
-
+	UP,
-    data object Up : TunnelStatus()
+	DOWN,
-
+	;
-    data object Down : TunnelStatus()
-
-    data class Stopping(val reason: StopReason) : TunnelStatus()
-
-    data object Starting : TunnelStatus()
-
-    enum class StopReason {
-        USER,
-        PING,
-        CONFIG_CHANGED,
-    }
 
 	fun isDown(): Boolean {
-        return this == Down
+		return this == DOWN
 	}
 
 	fun isUp(): Boolean {
-        return this == Up
+		return this == UP
-    }
-
-    fun isUpOrStarting(): Boolean {
-        return this == Up || this == Starting
-    }
-
-    fun isDownOrStopping(): Boolean {
-        return this == Down || this is Stopping
 	}
 }

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

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

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

@@ -2,8 +2,6 @@ package com.zaneschepke.wireguardautotunnel.domain.events
 
 sealed class KillSwitchEvent {
 	data class Start(val allowedIps: List<String>) : KillSwitchEvent()
-
 	data object Stop : KillSwitchEvent()
-
 	data object DoNothing : KillSwitchEvent()
 }

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

@@ -1,46 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.domain.model
-
-import com.zaneschepke.networkmonitor.AndroidNetworkMonitor
-
-data class AppSettings(
-    val id: Int = 0,
-    val isAutoTunnelEnabled: Boolean = false,
-    val isTunnelOnMobileDataEnabled: Boolean = false,
-    val trustedNetworkSSIDs: List<String> = emptyList(),
-    val isAlwaysOnVpnEnabled: Boolean = false,
-    val isTunnelOnEthernetEnabled: Boolean = false,
-    val isShortcutsEnabled: Boolean = false,
-    val isTunnelOnWifiEnabled: Boolean = false,
-    val isKernelEnabled: Boolean = false,
-    val isRestoreOnBootEnabled: Boolean = false,
-    val isMultiTunnelEnabled: Boolean = false,
-    val isPingEnabled: Boolean = false,
-    val isAmneziaEnabled: Boolean = false,
-    val isWildcardsEnabled: Boolean = false,
-    val 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,15 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.domain.model
-
-import com.zaneschepke.wireguardautotunnel.ui.theme.Theme
-
-data class AppState(
-    val isLocationDisclosureShown: Boolean,
-    val isBatteryOptimizationDisableShown: Boolean,
-    val isPinLockEnabled: Boolean,
-    val expandedTunnelIds: List<Int>,
-    val isLocalLogsEnabled: Boolean,
-    val isRemoteControlEnabled: Boolean,
-    val remoteKey: String?,
-    val locale: String?,
-    val theme: Theme,
-)

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

@@ -1,9 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.domain.model
-
-data class AppUpdate(
-    val version: String,
-    val title: String,
-    val releaseNotes: String,
-    val apkUrl: String?,
-    val apkFileName: String?,
-)

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

@@ -1,216 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.domain.model
-
-import com.wireguard.android.backend.Tunnel
-import com.wireguard.config.Config
-import com.zaneschepke.wireguardautotunnel.util.Constants
-import com.zaneschepke.wireguardautotunnel.util.extensions.*
-import java.io.InputStream
-import java.net.InetAddress
-import java.nio.charset.StandardCharsets
-import kotlin.coroutines.CoroutineContext
-import kotlinx.coroutines.withContext
-import timber.log.Timber
-
-data class TunnelConf(
-    val id: Int = 0,
-    val tunName: String,
-    val wgQuick: String,
-    val tunnelNetworks: List<String> = emptyList(),
-    val isMobileDataTunnel: Boolean = false,
-    val isPrimaryTunnel: Boolean = false,
-    val amQuick: String,
-    val isActive: Boolean = false,
-    val isPingEnabled: Boolean = false,
-    val pingInterval: Long? = null,
-    val pingCooldown: Long? = null,
-    val pingIp: String? = null,
-    val isEthernetTunnel: Boolean = false,
-    val isIpv4Preferred: Boolean = true,
-    @Transient private var stateChangeCallback: ((Any) -> Unit)? = null,
-) : Tunnel, org.amnezia.awg.backend.Tunnel {
-
-    fun setStateChangeCallback(callback: (Any) -> Unit) {
-        stateChangeCallback = callback
-    }
-
-    override fun equals(other: Any?): Boolean {
-        if (this === other) return true
-        if (other !is TunnelConf) return false
-        return id == other.id &&
-            tunName == other.tunName &&
-            wgQuick == other.wgQuick &&
-            amQuick == other.amQuick &&
-            isPrimaryTunnel == other.isPrimaryTunnel &&
-            isMobileDataTunnel == other.isMobileDataTunnel &&
-            isEthernetTunnel == other.isEthernetTunnel &&
-            isPingEnabled == other.isPingEnabled &&
-            pingIp == other.pingIp &&
-            pingCooldown == other.pingCooldown &&
-            pingInterval == other.pingInterval &&
-            tunnelNetworks == other.tunnelNetworks &&
-            isIpv4Preferred == other.isIpv4Preferred
-    }
-
-    override fun hashCode(): Int {
-        var result = id
-        result = 31 * result + tunName.hashCode()
-        result = 31 * result + wgQuick.hashCode()
-        result = 31 * result + amQuick.hashCode()
-        return result
-    }
-
-    fun isStaticallyConfigured(): Boolean {
-        return toAmConfig().peers.all { it.endpoint.get().host.isValidIpv4orIpv6Address() }
-    }
-
-    fun copyWithCallback(
-        id: Int = this.id,
-        tunName: String = this.tunName,
-        wgQuick: String = this.wgQuick,
-        tunnelNetworks: List<String> = this.tunnelNetworks,
-        isMobileDataTunnel: Boolean = this.isMobileDataTunnel,
-        isPrimaryTunnel: Boolean = this.isPrimaryTunnel,
-        amQuick: String = this.amQuick,
-        isActive: Boolean = this.isActive,
-        isPingEnabled: Boolean = this.isPingEnabled,
-        pingInterval: Long? = this.pingInterval,
-        pingCooldown: Long? = this.pingCooldown,
-        pingIp: String? = this.pingIp,
-        isEthernetTunnel: Boolean = this.isEthernetTunnel,
-        isIpv4Preferred: Boolean = this.isIpv4Preferred,
-    ): TunnelConf {
-        return TunnelConf(
-                id,
-                tunName,
-                wgQuick,
-                tunnelNetworks,
-                isMobileDataTunnel,
-                isPrimaryTunnel,
-                amQuick,
-                isActive,
-                isPingEnabled,
-                pingInterval,
-                pingCooldown,
-                pingIp,
-                isEthernetTunnel,
-                isIpv4Preferred,
-            )
-            .apply { stateChangeCallback = this@TunnelConf.stateChangeCallback }
-    }
-
-    fun toAmConfig(): org.amnezia.awg.config.Config {
-        return configFromAmQuick(amQuick.ifBlank { wgQuick })
-    }
-
-    fun toWgConfig(): Config {
-        return configFromWgQuick(wgQuick)
-    }
-
-    override fun getName(): String = tunName
-
-    override fun isIpv4ResolutionPreferred(): Boolean = isIpv4Preferred
-
-    override fun onStateChange(newState: org.amnezia.awg.backend.Tunnel.State) {
-        stateChangeCallback?.invoke(newState)
-    }
-
-    override fun onStateChange(newState: Tunnel.State) {
-        stateChangeCallback?.invoke(newState)
-    }
-
-    fun generateUniqueName(tunnelNames: List<String>): String {
-        var tunnelName = this.tunName
-        var num = 1
-        while (tunnelNames.any { it == tunnelName }) {
-            tunnelName =
-                if (!tunnelName.hasNumberInParentheses()) {
-                    "$name($num)"
-                } else {
-                    val pair = tunnelName.extractNameAndNumber()
-                    "${pair?.first}($num)"
-                }
-            num++
-        }
-        return tunnelName
-    }
-
-    suspend fun isTunnelPingable(context: CoroutineContext): Boolean {
-        return withContext(context) {
-            val config = toWgConfig()
-            if (pingIp != null) {
-                return@withContext InetAddress.getByName(pingIp)
-                    .isReachable(Constants.PING_TIMEOUT.toInt())
-                    .also { Timber.i("Ping reachable $pingIp: $it") }
-            }
-            config.peers
-                .map { peer -> peer.isReachable() }
-                .all { true }
-                .also { Timber.i("Ping of all peers reachable: $it") }
-        }
-    }
-
-    companion object {
-        fun configFromWgQuick(wgQuick: String): Config {
-            val inputStream: InputStream = wgQuick.byteInputStream()
-            return inputStream.bufferedReader(StandardCharsets.UTF_8).use { Config.parse(it) }
-        }
-
-        fun configFromAmQuick(amQuick: String): org.amnezia.awg.config.Config {
-            val inputStream: InputStream = amQuick.byteInputStream()
-            return inputStream.bufferedReader(StandardCharsets.UTF_8).use {
-                org.amnezia.awg.config.Config.parse(it)
-            }
-        }
-
-        fun tunnelConfigFromAmConfig(
-            config: org.amnezia.awg.config.Config,
-            name: String? = null,
-        ): TunnelConf {
-            val amQuick = config.toAwgQuickString(true)
-            val wgQuick = config.toWgQuickString()
-            return TunnelConf(
-                tunName = name ?: config.defaultName(),
-                wgQuick = wgQuick,
-                amQuick = amQuick,
-            )
-        }
-
-        private const val IPV6_ALL_NETWORKS = "::/0"
-        private const val IPV4_ALL_NETWORKS = "0.0.0.0/0"
-        val ALL_IPS = listOf(IPV4_ALL_NETWORKS, IPV6_ALL_NETWORKS)
-        private val IPV4_PUBLIC_NETWORKS =
-            listOf(
-                "0.0.0.0/5",
-                "8.0.0.0/7",
-                "11.0.0.0/8",
-                "12.0.0.0/6",
-                "16.0.0.0/4",
-                "32.0.0.0/3",
-                "64.0.0.0/2",
-                "128.0.0.0/3",
-                "160.0.0.0/5",
-                "168.0.0.0/6",
-                "172.0.0.0/12",
-                "172.32.0.0/11",
-                "172.64.0.0/10",
-                "172.128.0.0/9",
-                "173.0.0.0/8",
-                "174.0.0.0/7",
-                "176.0.0.0/4",
-                "192.0.0.0/9",
-                "192.128.0.0/11",
-                "192.160.0.0/13",
-                "192.169.0.0/16",
-                "192.170.0.0/15",
-                "192.172.0.0/14",
-                "192.176.0.0/12",
-                "192.192.0.0/10",
-                "193.0.0.0/8",
-                "194.0.0.0/7",
-                "196.0.0.0/6",
-                "200.0.0.0/5",
-                "208.0.0.0/4",
-            )
-        val LAN_BYPASS_ALLOWED_IPS = listOf(IPV6_ALL_NETWORKS) + IPV4_PUBLIC_NETWORKS
-    }
-}

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.model.TunnelConf
+import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
 
 interface AppDataRepository {
 	suspend fun getPrimaryOrFirstTunnel(): TunnelConf?

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

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