fix: create config not saving

Fixes bug where creating a config from scratch was failing to save

Closes #93 #96 #89

.editorconfig

@@ -1,14 +1,8 @@
-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}]
+indent_style = space
+insert_final_newline = true
+max_line_length = 100
+indent_size = 4
 ij_continuation_indent_size = 4
 ij_java_names_count_to_use_import_on_demand = 9999
 ij_kotlin_align_in_columns_case_branch = false
@@ -17,6 +11,8 @@ 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_allow_trailing_comma = true
+ij_kotlin_allow_trailing_comma_on_call_site = true
 ij_kotlin_assignment_wrap = normal
 ij_kotlin_blank_lines_after_class_header = 0
 ij_kotlin_blank_lines_around_block_when_branches = 0
@@ -24,7 +20,10 @@ ij_kotlin_blank_lines_before_declaration_with_comment_or_annotation_on_separate_
 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_call_parameters_wrap = on_every_item
 ij_kotlin_catch_on_new_line = false
+ij_kotlin_class_annotation_wrap = split_into_lines
+ij_kotlin_code_style_defaults = KOTLIN_OFFICIAL
 ij_kotlin_continuation_indent_for_chained_calls = true
 ij_kotlin_continuation_indent_for_expression_bodies = true
 ij_kotlin_continuation_indent_in_argument_lists = true
@@ -53,6 +52,7 @@ 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_method_parameters_wrap = on_every_item
 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
@@ -82,16 +82,4 @@ 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
+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/CODE_OF_CONDUCT.md

@@ -1,22 +0,0 @@
-# Contributor Code of Conduct
-
-## Pledge
-
-We as individuals involved in this project, pledge to participate in this
-community in a respectful, constructive, and civil manner as we work towards a common goal
-of delivering free, open source, and value adding software for all.
-
-## Standard
-
-The standard for this community is the Golden Rule.
-
-> “Do unto others as you would have them do unto you.”
-
-## Scope
-
-This Code of Conduct applies to all spaces related to WG Tunnel.
-
-## Incidents or Concerns
-
-For any incidents or concerns, reach out to Zane at
-<support@zaneschepke.com>.

.github/FUNDING.yml

@@ -1,2 +0,0 @@
-ko_fi: zaneschepke
-liberapay: zaneschepke

.github/workflows/android.yml

@@ -0,0 +1,87 @@
+# name of the workflow
+name: Android CI Tag Deployment
+
+on:
+  push:
+    tags:
+      - '*.*.*'
+
+jobs:
+  build:
+    name: Build Signed APK
+
+    runs-on: ubuntu-latest
+
+    env:
+      KEY_STORE_PATH: ${{ secrets.KEY_STORE_PATH }}
+      SIGNING_KEY_ALIAS: ${{ secrets.SIGNING_KEY_ALIAS }}
+      SIGNING_KEY_PASSWORD: ${{ secrets.SIGNING_KEY_PASSWORD }}
+      SIGNING_STORE_PASSWORD: ${{ secrets.SIGNING_STORE_PASSWORD }}
+
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: '17'
+          cache: gradle
+      - name: Grant execute permission for gradlew
+        run: chmod +x gradlew
+
+      # Here we need to decode keystore.jks from base64 string and place it
+      # in the folder specified in the release signing configuration
+      - name: Decode Keystore
+        id: decode_keystore
+        uses: timheuer/base64-to-file@v1.2
+        with:
+          fileName: 'android_keystore.jks'
+          fileDir: ${{ github.workspace }}/app/keystore/
+          encodedString: ${{ secrets.KEYSTORE }}
+
+      - name: Create service_account.json
+        id: createServiceAccount
+        run: echo '${{ secrets.SERVICE_ACCOUNT_JSON }}' > service_account.json
+
+      # Build and sign APK ("-x test" argument is used to skip tests)
+      # add fdroid flavor for apk upload
+      - name: Build Fdroid Release APK
+        run: ./gradlew :app:assembleFdroidRelease -x test
+
+      # get fdroid flavor release apk path
+      - name: Get apk path
+        id: apk-path
+        run: echo "path=$(find . -regex '^.*/build/outputs/apk/fdroid/release/.*\.apk$' -type f | head -1)" >> $GITHUB_OUTPUT
+
+      # Save the APK after the Build job is complete to publish it as a Github release in the next job
+      - name: Upload APK
+        uses: actions/upload-artifact@v4.0.0
+        with:
+          name: wgtunnel
+          path: ${{ steps.apk-path.outputs.path }}
+      - name: Download APK from build
+        uses: actions/download-artifact@v4
+        with:
+          name: wgtunnel
+      - name: Create Release with Fastlane changelog notes
+        id: create_release
+        uses: softprops/action-gh-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          # fix hardcode changelog file name
+          body_path: ${{ github.workspace }}/fastlane/metadata/android/en-US/changelogs/33400.txt
+          tag_name: ${{ github.ref_name }}
+          name: Release ${{ github.ref_name }}
+          draft: false
+          prerelease: false
+          files: ${{ github.workspace }}/${{ steps.apk-path.outputs.path }}
+      - name: Deploy with fastlane
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: '3.2' # Not needed with a .ruby-version file
+          bundler-cache: true
+
+      - name: Distribute app to Beta track 🚀
+        run: (cd ${{ github.workspace }} && bundle install && bundle exec fastlane beta)
+

.github/workflows/ci.yml

@@ -1,23 +0,0 @@
-name: ci-android
-
-on:
-    workflow_dispatch:
-    pull_request:
-
-jobs:
-  format:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: Set up JDK 17
-        uses: actions/setup-java@v4
-        with:
-          distribution: 'temurin'
-          java-version: '17'
-          cache: gradle
-
-      - name: Grant execute permission for gradlew
-        run: chmod +x gradlew
-
-      - name: Run ktlint
-        run: ./gradlew ktlintCheck

.github/workflows/issue-workflow.yml

@@ -1,20 +0,0 @@
-name: Issue Updates Workflow
-
-on:
-  issues:
-    types: [ opened, closed, reopened ]
-
-
-jobs:
-
-  build:
-    name: Build
-    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/publish-workflow.yml

@@ -1,21 +0,0 @@
-name: Release Updates Workflow
-
-on:
-  release:
-    types: [ published ]
-
-
-jobs:
-
-  build:
-    name: Build
-    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/release.yml

@@ -1,237 +0,0 @@
-name: release-android
-
-on:
-  schedule:
-    - cron: "4 3 * * *"
-  workflow_dispatch:
-    inputs:
-      track:
-        type: choice
-        description: "Google play release track"
-        options:
-          - none
-          - internal
-          - alpha
-          - beta
-          - production
-        default: alpha
-        required: true
-      release_type:
-        type: choice
-        description: "GitHub release type"
-        options:
-          - none
-          - prerelease
-          - nightly
-          - release
-        default: release
-        required: true
-      tag_name:
-        description: "Tag name for release"
-        required: false
-        default: nightly
-
-jobs:
-  build:
-    name: Build Signed APK
-    if: ${{ inputs.release_type != 'none' }}
-    runs-on: ubuntu-latest
-
-    env:
-      SIGNING_KEY_ALIAS: ${{ secrets.SIGNING_KEY_ALIAS }}
-      SIGNING_KEY_PASSWORD: ${{ secrets.SIGNING_KEY_PASSWORD }}
-      SIGNING_STORE_PASSWORD: ${{ secrets.SIGNING_STORE_PASSWORD }}
-      KEY_STORE_FILE: 'android_keystore.jks'
-      KEY_STORE_LOCATION: ${{ github.workspace }}/app/keystore/
-      GH_USER: ${{ secrets.GH_USER }}
-      # GH needed for gh cli
-      GH_TOKEN: ${{ secrets.GH_TOKEN }}
-      GH_REPO: ${{ github.repository }}
-
-    steps:
-      - uses: actions/checkout@v4
-      - name: Set up JDK 17
-        uses: actions/setup-java@v4
-        with:
-          distribution: 'temurin'
-          java-version: '17'
-          cache: gradle
-      - name: Grant execute permission for gradlew
-        run: chmod +x gradlew
-
-      - name: Install system dependencies
-        run: |
-          sudo apt update && sudo apt install -y gh apksigner
-
-      # Here we need to decode keystore.jks from base64 string and place it
-      # in the folder specified in the release signing configuration
-      - name: Decode Keystore
-        id: decode_keystore
-        uses: timheuer/base64-to-file@v1.2
-        with:
-          fileName: ${{ env.KEY_STORE_FILE }}
-          fileDir: ${{ env.KEY_STORE_LOCATION }}
-          encodedString: ${{ secrets.KEYSTORE }}
-
-      # create keystore path for gradle to read
-      - name: Create keystore path env var
-        run: |
-          store_path=${{ env.KEY_STORE_LOCATION }}${{ env.KEY_STORE_FILE }}
-          echo "KEY_STORE_PATH=$store_path" >> $GITHUB_ENV
-
-      - name: Create service_account.json
-        id: createServiceAccount
-        run: echo '${{ secrets.SERVICE_ACCOUNT_JSON }}' > service_account.json
-
-      # Build and sign APK ("-x test" argument is used to skip tests)
-      # add fdroid flavor for apk upload
-      - name: Build Fdroid Release APK
-        if: ${{ inputs.release_type != '' && inputs.release_type == 'release' }}
-        run: ./gradlew :app:assembleFdroidRelease -x test
-
-      - name: Build Fdroid Prerelease APK
-        if: ${{ inputs.release_type != '' && inputs.release_type == 'prerelease' }}
-        run: ./gradlew :app:assembleFdroidPrerelease -x test
-
-      - name: Build Fdroid Nightly APK
-        if: ${{ inputs.release_type == '' || inputs.release_type == 'nightly' }}
-        run: ./gradlew :app:assembleFdroidNightly -x test
-
-      - if: ${{ inputs.release_type == '' || inputs.release_type == 'nightly' }}
-        run: echo "APK_PATH=$(find . -regex '^.*/build/outputs/apk/fdroid/nightly/.*\.apk$' -type f | head -1)" >> $GITHUB_ENV
-      - if: ${{ inputs.release_type != '' && inputs.release_type == 'release' }}
-        run: echo "APK_PATH=$(find . -regex '^.*/build/outputs/apk/fdroid/release/.*\.apk$' -type f | head -1)" >> $GITHUB_ENV
-      - if: ${{ inputs.release_type != '' && inputs.release_type == 'prerelease' }}
-        run: echo "APK_PATH=$(find . -regex '^.*/build/outputs/apk/fdroid/prerelease/.*\.apk$' -type f | head -1)" >> $GITHUB_ENV
-
-      - name: Get version code
-        if: ${{ inputs.release_type == 'release' }}
-        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
-
-      # Save the APK after the Build job is complete to publish it as a Github release in the next job
-      - name: Upload APK
-        uses: actions/upload-artifact@v4.3.6
-        with:
-          name: wgtunnel
-          path: ${{ env.APK_PATH }}
-
-      - name: Download APK from build
-        uses: actions/download-artifact@v4
-        with:
-          name: wgtunnel
-
-      - name: Repository Dispatch for my F-Droid repo
-        uses: peter-evans/repository-dispatch@v3
-        if: ${{ inputs.release_type == 'release' }}
-        with:
-          token: ${{ secrets.PAT }}
-          repository: zaneschepke/fdroid
-          event-type: fdroid-update
-
-      # Setup TAG_NAME, which is used as a general "name"
-      - if: github.event_name == 'workflow_dispatch'
-        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: ${{ inputs.release_type == 'release' }}
-        run: |
-          RELEASE_NOTES="$(cat ${{ github.workspace }}/fastlane/metadata/android/en-US/changelogs/${{ env.VERSION_CODE }}.txt)"
-          echo "RELEASE_NOTES<<EOF" >> $GITHUB_ENV
-          echo "$RELEASE_NOTES" >> $GITHUB_ENV
-          echo "EOF" >> $GITHUB_ENV
-
-      - name: On nightly release notes
-        if: ${{ contains(env.TAG_NAME, 'nightly') }}
-        run: |
-          echo "RELEASE_NOTES=Nightly build for the latest development version of the app." >> $GITHUB_ENV
-          gh release delete nightly --yes || true
-          git push origin :nightly || true
-
-      - name: On prerelease release notes
-        if: ${{ inputs.release_type == 'prerelease' }}
-        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: echo "checksum=$(apksigner verify -print-certs ${{ env.APK_PATH }} | grep -Po "(?<=SHA-256 digest:) .*" | tr -d "[:blank:]")" >> $GITHUB_OUTPUT
-
-
-      - name: Create Release with Fastlane changelog notes
-        id: create_release
-        uses: softprops/action-gh-release@v2
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          body: |
-            ${{ env.RELEASE_NOTES }}
-
-            SHA256 fingerprint:
-            ```${{ steps.checksum.outputs.checksum }}```
-          tag_name: ${{ env.TAG_NAME }}
-          name: ${{ env.TAG_NAME }}
-          draft: false
-          prerelease: ${{ inputs.release_type == 'prerelease' || inputs.release_type == '' || inputs.release_type == 'nightly' }}
-          make_latest: ${{ inputs.release_type == 'release' }}
-          files: ${{ github.workspace }}/${{ env.APK_PATH }}
-
-  publish-play:
-    if: ${{ inputs.track != 'none' && inputs.track != '' }}
-    name: Publish to Google Play
-    runs-on: ubuntu-latest
-
-    env:
-      SIGNING_KEY_ALIAS: ${{ secrets.SIGNING_KEY_ALIAS }}
-      SIGNING_KEY_PASSWORD: ${{ secrets.SIGNING_KEY_PASSWORD }}
-      SIGNING_STORE_PASSWORD: ${{ secrets.SIGNING_STORE_PASSWORD }}
-      KEY_STORE_FILE: 'android_keystore.jks'
-      KEY_STORE_LOCATION: ${{ github.workspace }}/app/keystore/
-      GH_USER: ${{ secrets.GH_USER }}
-      GH_TOKEN: ${{ secrets.GH_TOKEN }}
-
-    steps:
-      - uses: actions/checkout@v4
-      - name: Set up JDK 17
-        uses: actions/setup-java@v4
-        with:
-          distribution: 'temurin'
-          java-version: '17'
-          cache: gradle
-
-      - name: Grant execute permission for gradlew
-        run: chmod +x gradlew
-
-      # Here we need to decode keystore.jks from base64 string and place it
-      # in the folder specified in the release signing configuration
-      - name: Decode Keystore
-        id: decode_keystore
-        uses: timheuer/base64-to-file@v1.2
-        with:
-          fileName: ${{ env.KEY_STORE_FILE }}
-          fileDir: ${{ env.KEY_STORE_LOCATION }}
-          encodedString: ${{ secrets.KEYSTORE }}
-
-      # create keystore path for gradle to read
-      - name: Create keystore path env var
-        run: |
-          store_path=${{ env.KEY_STORE_LOCATION }}${{ env.KEY_STORE_FILE }}
-          echo "KEY_STORE_PATH=$store_path" >> $GITHUB_ENV
-
-      - name: Create service_account.json
-        id: createServiceAccount
-        run: echo '${{ secrets.SERVICE_ACCOUNT_JSON }}' > service_account.json
-
-      - name: Deploy with fastlane
-        uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: '3.2' # Not needed with a .ruby-version file
-          bundler-cache: true
-
-      - name: Distribute app to Prod track 🚀
-        run: (cd ${{ github.workspace }} && bundle install && bundle exec fastlane ${{ inputs.track }})
-

.gitignore

@@ -71,4 +71,3 @@ app/release/output.json
 .idea/codeStyles/
 # where we keep our signing secrets locally
 app/signing.properties
-/.kotlin/

README.md

@@ -4,9 +4,8 @@ WG Tunnel
 
 <div align="center">
 
-[![Discord](https://img.shields.io/badge/Discord-%235865F2.svg?style=for-the-badge&logo=discord&logoColor=white)](https://discord.gg/rbRRNh6H7V)
+[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
-[![X Community](https://img.shields.io/badge/X-000000?style=for-the-badge&logo=x&logoColor=white)](https://twitter.com/i/communities/1780655267685736818)
+[![Discord Chat](https://img.shields.io/discord/1108285024631001111.svg)](https://discord.gg/rbRRNh6H7V)
-[![Telegram](https://img.shields.io/badge/Telegram-2CA5E0?style=for-the-badge&logo=telegram&logoColor=white)](https://t.me/wgtunnel)
 
 </div>
 
@@ -14,16 +13,22 @@ WG Tunnel
 
 
 [![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)
+[![Fire TV](https://img.shields.io/badge/fire%20tv-fc3b2d?style=for-the-badge&logo=amazon%20fire%20tv&logoColor=white)](https://www.amazon.com/gp/product/B0CFGGL7WK)
 [![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/)
 
 
+</div>
+
+<div align="center">
+
+[![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/N4N8NMJN2)
+
 </div>
 
 
 <div align="left">
 
-This is an alternative Android Application for [WireGuard](https://www.wireguard.com/)
+This is an alternative Android Application for [WireGuard](https://www.wireguard.com/) with added
-and [AmneziaWG](https://docs.amnezia.org/documentation/amnezia-wg/) with added
 features. Built using the [wireguard-android](https://github.com/WireGuard/wireguard-android)
 library and [Jetpack Compose](https://developer.android.com/jetpack/compose), this application was
 inspired by the official [WireGuard Android](https://github.com/WireGuard/wireguard-android) app.
@@ -51,60 +56,29 @@ and on while on different networks. This app was created to offer a free solutio
 ## Features
 
 * Add tunnels via .conf file, zip, manual entry, or QR code
-* Auto connect to tunnels based on Wi-Fi SSID, ethernet, or mobile data
+* Auto connect to VPN based on Wi-Fi SSID, ethernet, or mobile data
 * Split tunneling by application with search
 * WireGuard support for kernel and userspace modes
-* Amnezia support for userspace mode for DPI/censorship protection
-* Pre/Post Up/Down scripts support for all modes on a rooted device
 * Always-On VPN support
-* Export Amnezia and WireGuard tunnels to zip
+* Export tunnels to zip
-* Quick tile support for tunnel toggling, auto-tunneling
+* Quick tile support for VPN toggling
-* Static shortcuts support for tunnel toggling, auto-tunneling
+* Static shortcuts support for primary tunnel for automation integration
 * Intent automation support for all tunnels
-* Automatic auto-tunneling service and/or tunnel restart after reboot or app update
+* Automatic service restart after reboot
 * Battery preservation measures
-* Restart tunnel on ping failure (beta)
 
-## Fdroid
+## Docs (WIP)
 
-Want updates faster?
+Basic documentation of the feature and behaviors of this app can be found [here](https://zaneschepke.com/wgtunnel-docs/overview.html).
-
-Check out my personal [fdroid repository](https://github.com/zaneschepke/fdroid) to get updates the
-moment they are released.
-
-## Docs
-
-Information about features, behaviors, and answers to common questions can be found in the
-app [documentation](https://zaneschepke.com/wgtunnel-docs/overview.html).
 
 The repository for these docs can be found [here](https://github.com/zaneschepke/wgtunnel-docs).
 
-## Translation
-
-This app is using [Weblate](https://weblate.org) to assist with translations.
-
-Help translate WG Tunnel into your language
-at [Hosted Weblate](https://hosted.weblate.org/engage/wg-tunnel/).\
-[![Translation status](https://hosted.weblate.org/widgets/wg-tunnel/-/multi-auto.svg)](https://hosted.weblate.org/engage/wg-tunnel/)
-
 ## Building
 
 ```
 $ git clone https://github.com/zaneschepke/wgtunnel
 $ cd wgtunnel
-```
-
-And then build the app:
-
-```
 $ ./gradlew assembleDebug
 ```
 
-## Contributing
+</span>
-
-Any contributions in the form of feedback, issues, code, or translations are welcome and much
-appreciated!
-
-Please read
-the [code of conduct](https://github.com/zaneschepke/wgtunnel?tab=coc-ov-file#contributor-code-of-conduct)
-before contributing.

SECURITY.md

@@ -1,5 +0,0 @@
-# Security Policy
-
-## Reporting a Vulnerability
-
-Please report security issues to `support@zaneschepke.com`

app/build.gradle.kts

@@ -1,221 +1,211 @@
+import java.util.Properties
+
 plugins {
-	alias(libs.plugins.android.application)
+    alias(libs.plugins.android.application)
-	alias(libs.plugins.kotlin.android)
+    alias(libs.plugins.kotlin.android)
-	alias(libs.plugins.hilt.android)
+    alias(libs.plugins.hilt.android)
-	alias(libs.plugins.kotlinxSerialization)
+    id("org.jetbrains.kotlin.plugin.serialization")
-	alias(libs.plugins.ksp)
+    alias(libs.plugins.ksp)
-	alias(libs.plugins.compose.compiler)
-	alias(libs.plugins.grgit)
 }
 
 android {
-	namespace = Constants.APP_ID
+    namespace = Constants.APP_ID
-	compileSdk = Constants.TARGET_SDK
+    compileSdk = Constants.TARGET_SDK
 
-	androidResources {
+    defaultConfig {
-		generateLocaleConfig = true
+        applicationId = Constants.APP_ID
-	}
+        minSdk = Constants.MIN_SDK
+        targetSdk = Constants.TARGET_SDK
+        versionCode = Constants.VERSION_CODE
+        versionName = Constants.VERSION_NAME
 
-	defaultConfig {
+        ksp { arg("room.schemaLocation", "$projectDir/schemas") }
-		applicationId = Constants.APP_ID
-		minSdk = Constants.MIN_SDK
-		targetSdk = Constants.TARGET_SDK
-		versionCode = determineVersionCode()
-		versionName = determineVersionName()
 
-		ksp { arg("room.schemaLocation", "$projectDir/schemas") }
+        sourceSets {
+            getByName("debug").assets.srcDirs(files("$projectDir/schemas")) // Room
+        }
 
-		sourceSets {
+        resourceConfigurations.addAll(listOf("en"))
-			getByName("debug").assets.srcDirs(files("$projectDir/schemas")) // Room
-		}
 
-		testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-		vectorDrawables { useSupportLibrary = true }
+        vectorDrawables { useSupportLibrary = true }
-	}
+    }
 
-	signingConfigs {
+    signingConfigs {
-		create(Constants.RELEASE) {
+        create(Constants.RELEASE) {
-			storeFile = getStoreFile()
+            val properties =
-			storePassword = getSigningProperty(Constants.STORE_PASS_VAR)
+                Properties().apply {
-			keyAlias = getSigningProperty(Constants.KEY_ALIAS_VAR)
+                    // created local file for signing details
-			keyPassword = getSigningProperty(Constants.KEY_PASS_VAR)
+                    try {
-		}
+                        load(file("signing.properties").reader())
-	}
+                    } catch (_: Exception) {
+                        load(file("signing_template.properties").reader())
+                    }
+                }
 
-	buildTypes {
+            // try to get secrets from env first for pipeline build, then properties file for local
-		// don't strip
+            // build
-		packaging.jniLibs.keepDebugSymbols.addAll(
+            storeFile =
-			listOf("libwg-go.so", "libwg-quick.so", "libwg.so"),
+                file(
-		)
+                    System.getenv()
+                        .getOrDefault(
+                            Constants.KEY_STORE_PATH_VAR,
+                            properties.getProperty(Constants.KEY_STORE_PATH_VAR),
+                        ),
+                )
+            storePassword =
+                System.getenv()
+                    .getOrDefault(
+                        Constants.STORE_PASS_VAR,
+                        properties.getProperty(Constants.STORE_PASS_VAR),
+                    )
+            keyAlias =
+                System.getenv()
+                    .getOrDefault(
+                        Constants.KEY_ALIAS_VAR,
+                        properties.getProperty(Constants.KEY_ALIAS_VAR),
+                    )
+            keyPassword =
+                System.getenv()
+                    .getOrDefault(
+                        Constants.KEY_PASS_VAR,
+                        properties.getProperty(Constants.KEY_PASS_VAR),
+                    )
+        }
+    }
 
-		release {
+    buildTypes {
-			isDebuggable = false
+        // don't strip
-			isMinifyEnabled = true
+        packaging.jniLibs.keepDebugSymbols.addAll(
-			isShrinkResources = true
+            listOf("libwg-go.so", "libwg-quick.so", "libwg.so"),
-			proguardFiles(
+        )
-				getDefaultProguardFile("proguard-android-optimize.txt"),
-				"proguard-rules.pro",
-			)
-			signingConfig = signingConfigs.getByName(Constants.RELEASE)
-		}
-		debug {
-			applicationIdSuffix = ".debug"
-			versionNameSuffix = "-debug"
-			resValue("string", "app_name", "WG Tunnel - Debug")
-			isDebuggable = true
-		}
 
-		create(Constants.PRERELEASE) {
+        applicationVariants.all {
-			initWith(buildTypes.getByName(Constants.RELEASE))
+            val variant = this
-			applicationIdSuffix = ".prerelease"
+            variant.outputs
-			versionNameSuffix = "-pre"
+                .map { it as com.android.build.gradle.internal.api.BaseVariantOutputImpl }
-			resValue("string", "app_name", "WG Tunnel - Pre")
+                .forEach { output ->
-		}
+                    val outputFileName =
-
+                        "${Constants.APP_NAME}-${variant.flavorName}-${variant.buildType.name}-${variant.versionName}.apk"
-		create(Constants.NIGHTLY) {
+                    output.outputFileName = outputFileName
-			initWith(buildTypes.getByName(Constants.RELEASE))
+                }
-			applicationIdSuffix = ".nightly"
+        }
-			versionNameSuffix = "-nightly"
+        release {
-			resValue("string", "app_name", "WG Tunnel - Nightly")
+            isDebuggable = false
-		}
+            isMinifyEnabled = true
-
+            isShrinkResources = true
-		applicationVariants.all {
+            proguardFiles(
-			val variant = this
+                getDefaultProguardFile("proguard-android-optimize.txt"),
-			variant.outputs
+                "proguard-rules.pro",
-				.map { it as com.android.build.gradle.internal.api.BaseVariantOutputImpl }
+            )
-				.forEach { output ->
+            signingConfig = signingConfigs.getByName(Constants.RELEASE)
-					val outputFileName =
+        }
-						"${Constants.APP_NAME}-${variant.flavorName}-" +
+        debug { isDebuggable = true }
-							"${variant.buildType.name}-${variant.versionName}.apk"
+    }
-					output.outputFileName = outputFileName
+    flavorDimensions.add(Constants.TYPE)
-				}
+    productFlavors {
-		}
+        create("fdroid") {
-	}
+            dimension = Constants.TYPE
-	flavorDimensions.add(Constants.TYPE)
+            proguardFile("fdroid-rules.pro")
-	productFlavors {
+        }
-		create("fdroid") {
+        create("general") {
-			dimension = Constants.TYPE
+            dimension = Constants.TYPE
-			proguardFile("fdroid-rules.pro")
+            if (BuildHelper.isReleaseBuild(gradle) && BuildHelper.isGeneralFlavor(gradle)) {
-		}
+                apply(plugin = "com.google.gms.google-services")
-		create("general") {
+                apply(plugin = "com.google.firebase.crashlytics")
-			dimension = Constants.TYPE
+            }
-		}
+        }
-	}
+    }
-	compileOptions {
+    compileOptions {
-		sourceCompatibility = JavaVersion.VERSION_17
+        sourceCompatibility = JavaVersion.VERSION_17
-		targetCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
-		isCoreLibraryDesugaringEnabled = true
+        isCoreLibraryDesugaringEnabled = true
-	}
+    }
-	kotlinOptions { jvmTarget = Constants.JVM_TARGET }
+    kotlinOptions { jvmTarget = Constants.JVM_TARGET }
-	buildFeatures {
+    buildFeatures {
-		compose = true
+        compose = true
-		buildConfig = true
+        buildConfig = true
-	}
+    }
-	packaging { resources { excludes += "/META-INF/{AL2.0,LGPL2.1}" } }
+    composeOptions { kotlinCompilerExtensionVersion = Constants.COMPOSE_COMPILER_EXTENSION_VERSION }
+    packaging { resources { excludes += "/META-INF/{AL2.0,LGPL2.1}" } }
 }
 
 val generalImplementation by configurations
 
 dependencies {
+    implementation(libs.androidx.core.ktx)
+    implementation(libs.androidx.lifecycle.runtime.ktx)
+    // optional - helpers for implementing LifecycleOwner in a Service
+    implementation(libs.androidx.lifecycle.service)
+    implementation(libs.androidx.activity.compose)
+    implementation(platform(libs.androidx.compose.bom))
+    implementation(libs.androidx.compose.ui)
+    implementation(libs.androidx.compose.ui.graphics)
+    implementation(libs.androidx.compose.ui.tooling.preview)
+    implementation(libs.androidx.material3)
+    implementation(libs.androidx.appcompat)
 
-	implementation(project(":logcatter"))
+    // test
+    testImplementation(libs.junit)
+    testImplementation(libs.androidx.junit)
+    androidTestImplementation(libs.androidx.junit)
+    androidTestImplementation(libs.androidx.espresso.core)
+    androidTestImplementation(platform(libs.androidx.compose.bom))
+    androidTestImplementation(libs.androidx.compose.ui.test)
+    androidTestImplementation(libs.androidx.room.testing)
+    debugImplementation(libs.androidx.compose.ui.tooling)
+    debugImplementation(libs.androidx.compose.manifest)
 
-	implementation(libs.androidx.core.ktx)
+    // wg
-	implementation(libs.androidx.lifecycle.runtime.ktx)
+    implementation(libs.tunnel)
+    coreLibraryDesugaring(libs.desugar.jdk.libs)
 
-	// helpers for implementing LifecycleOwner in a Service
+    // logging
-	implementation(libs.androidx.lifecycle.service)
+    implementation(libs.timber)
-	implementation(libs.androidx.activity.compose)
-	implementation(platform(libs.androidx.compose.bom))
-	implementation(libs.androidx.compose.ui)
-	implementation(libs.androidx.compose.ui.graphics)
-	implementation(libs.androidx.compose.ui.tooling.preview)
-	implementation(libs.androidx.material3)
-	implementation(libs.androidx.appcompat)
 
-	// test
+    // compose navigation
-	testImplementation(libs.junit)
+    implementation(libs.androidx.navigation.compose)
-	testImplementation(libs.androidx.junit)
+    implementation(libs.androidx.hilt.navigation.compose)
-	androidTestImplementation(libs.androidx.junit)
-	androidTestImplementation(libs.androidx.espresso.core)
-	androidTestImplementation(platform(libs.androidx.compose.bom))
-	androidTestImplementation(libs.androidx.compose.ui.test)
-	androidTestImplementation(libs.androidx.room.testing)
-	debugImplementation(libs.androidx.compose.ui.tooling)
-	debugImplementation(libs.androidx.compose.manifest)
 
-	// get tunnel lib from github packages or mavenLocal
+    // hilt
-// 	implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.aar"))))
+    implementation(libs.hilt.android)
-	implementation(libs.tunnel)
+    ksp(libs.hilt.android.compiler)
-	implementation(libs.amneziawg.android)
-	coreLibraryDesugaring(libs.desugar.jdk.libs)
 
-	// logging
+    // accompanist
-	implementation(libs.timber)
+    implementation(libs.accompanist.systemuicontroller)
+    implementation(libs.accompanist.permissions)
+    implementation(libs.accompanist.flowlayout)
+    implementation(libs.accompanist.drawablepainter)
 
-	// compose navigation
+    // storage
-	implementation(libs.androidx.navigation.compose)
+    implementation(libs.androidx.room.runtime)
-	implementation(libs.androidx.hilt.navigation.compose)
+    ksp(libs.androidx.room.compiler)
+    implementation(libs.androidx.room.ktx)
+    implementation(libs.androidx.datastore.preferences)
 
-	implementation(libs.zaneschepke.multifab)
+    // lifecycle
+    implementation(libs.lifecycle.runtime.compose)
+    implementation(libs.androidx.lifecycle.runtime.ktx)
+    implementation(libs.androidx.lifecycle.process)
 
-	// hilt
+    // icons
-	implementation(libs.hilt.android)
+    implementation(libs.material.icons.extended)
-	ksp(libs.hilt.android.compiler)
+    // serialization
+    implementation(libs.kotlinx.serialization.json)
 
-	// accompanist
+    // firebase crashlytics
-	implementation(libs.accompanist.permissions)
+    generalImplementation(platform(libs.firebase.bom))
-	implementation(libs.accompanist.flowlayout)
+    generalImplementation(libs.google.firebase.crashlytics.ktx)
-	implementation(libs.accompanist.drawablepainter)
+    generalImplementation(libs.google.firebase.analytics.ktx)
 
-	// storage
+    // barcode scanning
-	implementation(libs.androidx.room.runtime)
+    implementation(libs.zxing.android.embedded)
-	ksp(libs.androidx.room.compiler)
+    implementation(libs.zxing.core)
-	implementation(libs.androidx.room.ktx)
-	implementation(libs.androidx.datastore.preferences)
 
-	// lifecycle
+    // bio
-	implementation(libs.lifecycle.runtime.compose)
+    implementation(libs.androidx.biometric.ktx)
-	implementation(libs.androidx.lifecycle.runtime.ktx)
-	implementation(libs.androidx.lifecycle.process)
 
-	// icons
+    // shortcuts
-	implementation(libs.material.icons.extended)
+    implementation(libs.androidx.core)
-	// serialization
+    implementation(libs.androidx.core.google.shortcuts)
-	implementation(libs.kotlinx.serialization.json)
-
-	// barcode scanning
-	implementation(libs.zxing.android.embedded)
-
-	// bio
-	implementation(libs.androidx.biometric.ktx)
-	implementation(libs.pin.lock.compose)
-
-	// shortcuts
-	implementation(libs.androidx.core)
-	implementation(libs.androidx.core.google.shortcuts)
-
-	// splash
-	implementation(libs.androidx.core.splashscreen)
-}
-
-fun determineVersionCode(): Int {
-	return with(getBuildTaskName().lowercase()) {
-		when {
-			contains(Constants.NIGHTLY) -> Constants.VERSION_CODE + Constants.NIGHTLY_CODE
-			contains(Constants.PRERELEASE) -> Constants.VERSION_CODE + Constants.PRERELEASE_CODE
-			else -> Constants.VERSION_CODE
-		}
-	}
-}
-
-fun determineVersionName(): String {
-	return with(getBuildTaskName().lowercase()) {
-		when {
-			contains(Constants.NIGHTLY) || contains(Constants.PRERELEASE) ->
-				Constants.VERSION_NAME +
-					"-${grgitService.service.get().grgit.head().abbreviatedId}"
-			else -> Constants.VERSION_NAME
-		}
-	}
 }

app/fdroid-rules.pro

@@ -2,4 +2,4 @@
 
 -keepclassmembers class * extends androidx.datastore.preferences.protobuf.GeneratedMessageLite {
     <fields>;
-}
+}

app/google-services.json

@@ -0,0 +1,39 @@
+{
+  "project_info": {
+    "project_number": "328300975830",
+    "project_id": "wireguard-auto-tunnel",
+    "storage_bucket": "wireguard-auto-tunnel.appspot.com"
+  },
+  "client": [
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:328300975830:android:82cd774598ccb7234b1b77",
+        "android_client_info": {
+          "package_name": "com.zaneschepke.wireguardautotunnel"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "328300975830-m72lc3hr69ddhdqh9ngr27rvc8o0jb2d.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyBsSMY0LlckizXDnuYBy7nXWGSdl8zZedI"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": [
+            {
+              "client_id": "328300975830-m72lc3hr69ddhdqh9ngr27rvc8o0jb2d.apps.googleusercontent.com",
+              "client_type": 3
+            }
+          ]
+        }
+      }
+    }
+  ],
+  "configuration_version": "1"
+}

app/proguard-rules.pro

@@ -21,4 +21,6 @@
 #-renamesourcefileattribute SourceFile
 -keepclassmembers class * extends androidx.datastore.preferences.protobuf.GeneratedMessageLite {
     <fields>;
-}
+}
+
+

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

@@ -1,168 +0,0 @@
-{
-  "formatVersion": 1,
-  "database": {
-    "version": 6,
-    "identityHash": "625820076477aca948536f7bccccc7ca",
-    "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, `default_tunnel` TEXT, `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_battery_saver_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_auto_tunnel_paused` INTEGER NOT NULL DEFAULT false, `is_ping_enabled` INTEGER NOT NULL DEFAULT false)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isAutoTunnelEnabled",
-            "columnName": "is_tunnel_enabled",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isTunnelOnMobileDataEnabled",
-            "columnName": "is_tunnel_on_mobile_data_enabled",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "trustedNetworkSSIDs",
-            "columnName": "trusted_network_ssids",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "defaultTunnel",
-            "columnName": "default_tunnel",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "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": "isBatterySaverEnabled",
-            "columnName": "is_battery_saver_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": "isAutoTunnelPaused",
-            "columnName": "is_auto_tunnel_paused",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isPingEnabled",
-            "columnName": "is_ping_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "id"
-          ]
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "TunnelConfig",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `name` TEXT NOT NULL, `wg_quick` TEXT NOT NULL)",
-        "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
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "id"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_TunnelConfig_name",
-            "unique": true,
-            "columnNames": [
-              "name"
-            ],
-            "orders": [],
-            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_TunnelConfig_name` ON `${TABLE_NAME}` (`name`)"
-          }
-        ],
-        "foreignKeys": []
-      }
-    ],
-    "views": [],
-    "setupQueries": [
-      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
-      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '625820076477aca948536f7bccccc7ca')"
-    ]
-  }
-}

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

@@ -1,176 +0,0 @@
-{
-  "formatVersion": 1,
-  "database": {
-    "version": 7,
-    "identityHash": "e65e4e7cf01f50fb03196d47b54288b1",
-    "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_auto_tunnel_paused` INTEGER NOT NULL DEFAULT false, `is_ping_enabled` INTEGER NOT NULL DEFAULT false)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isAutoTunnelEnabled",
-            "columnName": "is_tunnel_enabled",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isTunnelOnMobileDataEnabled",
-            "columnName": "is_tunnel_on_mobile_data_enabled",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "trustedNetworkSSIDs",
-            "columnName": "trusted_network_ssids",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isAlwaysOnVpnEnabled",
-            "columnName": "is_always_on_vpn_enabled",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isTunnelOnEthernetEnabled",
-            "columnName": "is_tunnel_on_ethernet_enabled",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isShortcutsEnabled",
-            "columnName": "is_shortcuts_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isTunnelOnWifiEnabled",
-            "columnName": "is_tunnel_on_wifi_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isKernelEnabled",
-            "columnName": "is_kernel_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isRestoreOnBootEnabled",
-            "columnName": "is_restore_on_boot_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isMultiTunnelEnabled",
-            "columnName": "is_multi_tunnel_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isAutoTunnelPaused",
-            "columnName": "is_auto_tunnel_paused",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isPingEnabled",
-            "columnName": "is_ping_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "id"
-          ]
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "TunnelConfig",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `name` TEXT NOT NULL, `wg_quick` TEXT NOT NULL, `tunnel_networks` TEXT NOT NULL DEFAULT '', `is_mobile_data_tunnel` INTEGER NOT NULL DEFAULT false, `is_primary_tunnel` INTEGER NOT NULL DEFAULT false)",
-        "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"
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "id"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_TunnelConfig_name",
-            "unique": true,
-            "columnNames": [
-              "name"
-            ],
-            "orders": [],
-            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_TunnelConfig_name` ON `${TABLE_NAME}` (`name`)"
-          }
-        ],
-        "foreignKeys": []
-      }
-    ],
-    "views": [],
-    "setupQueries": [
-      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
-      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'e65e4e7cf01f50fb03196d47b54288b1')"
-    ]
-  }
-}

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

@@ -1,190 +0,0 @@
-{
-  "formatVersion": 1,
-  "database": {
-    "version": 8,
-    "identityHash": "b4d4a7c489f6b2f0d3aa4fa6f37b4935",
-    "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_auto_tunnel_paused` INTEGER NOT NULL DEFAULT false, `is_ping_enabled` INTEGER NOT NULL DEFAULT false, `is_amnezia_enabled` INTEGER NOT NULL DEFAULT false)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isAutoTunnelEnabled",
-            "columnName": "is_tunnel_enabled",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isTunnelOnMobileDataEnabled",
-            "columnName": "is_tunnel_on_mobile_data_enabled",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "trustedNetworkSSIDs",
-            "columnName": "trusted_network_ssids",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isAlwaysOnVpnEnabled",
-            "columnName": "is_always_on_vpn_enabled",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isTunnelOnEthernetEnabled",
-            "columnName": "is_tunnel_on_ethernet_enabled",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isShortcutsEnabled",
-            "columnName": "is_shortcuts_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isTunnelOnWifiEnabled",
-            "columnName": "is_tunnel_on_wifi_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isKernelEnabled",
-            "columnName": "is_kernel_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isRestoreOnBootEnabled",
-            "columnName": "is_restore_on_boot_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isMultiTunnelEnabled",
-            "columnName": "is_multi_tunnel_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isAutoTunnelPaused",
-            "columnName": "is_auto_tunnel_paused",
-            "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"
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "id"
-          ]
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "TunnelConfig",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `name` TEXT NOT NULL, `wg_quick` TEXT NOT NULL, `tunnel_networks` TEXT NOT NULL DEFAULT '', `is_mobile_data_tunnel` INTEGER NOT NULL DEFAULT false, `is_primary_tunnel` INTEGER NOT NULL DEFAULT false, `am_quick` TEXT NOT NULL DEFAULT '')",
-        "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": "''"
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "id"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_TunnelConfig_name",
-            "unique": true,
-            "columnNames": [
-              "name"
-            ],
-            "orders": [],
-            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_TunnelConfig_name` ON `${TABLE_NAME}` (`name`)"
-          }
-        ],
-        "foreignKeys": []
-      }
-    ],
-    "views": [],
-    "setupQueries": [
-      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
-      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'b4d4a7c489f6b2f0d3aa4fa6f37b4935')"
-    ]
-  }
-}

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

@@ -1,197 +0,0 @@
-{
-  "formatVersion": 1,
-  "database": {
-    "version": 9,
-    "identityHash": "e2c91dbf1885a9da592d3f54f1e08302",
-    "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_auto_tunnel_paused` INTEGER NOT NULL DEFAULT false, `is_ping_enabled` INTEGER NOT NULL DEFAULT false, `is_amnezia_enabled` INTEGER NOT NULL DEFAULT false)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isAutoTunnelEnabled",
-            "columnName": "is_tunnel_enabled",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isTunnelOnMobileDataEnabled",
-            "columnName": "is_tunnel_on_mobile_data_enabled",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "trustedNetworkSSIDs",
-            "columnName": "trusted_network_ssids",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isAlwaysOnVpnEnabled",
-            "columnName": "is_always_on_vpn_enabled",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isTunnelOnEthernetEnabled",
-            "columnName": "is_tunnel_on_ethernet_enabled",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isShortcutsEnabled",
-            "columnName": "is_shortcuts_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isTunnelOnWifiEnabled",
-            "columnName": "is_tunnel_on_wifi_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isKernelEnabled",
-            "columnName": "is_kernel_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isRestoreOnBootEnabled",
-            "columnName": "is_restore_on_boot_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isMultiTunnelEnabled",
-            "columnName": "is_multi_tunnel_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isAutoTunnelPaused",
-            "columnName": "is_auto_tunnel_paused",
-            "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"
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "id"
-          ]
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "TunnelConfig",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `name` TEXT NOT NULL, `wg_quick` TEXT NOT NULL, `tunnel_networks` TEXT NOT NULL DEFAULT '', `is_mobile_data_tunnel` INTEGER NOT NULL DEFAULT false, `is_primary_tunnel` INTEGER NOT NULL DEFAULT false, `am_quick` TEXT NOT NULL DEFAULT '', `is_Active` INTEGER NOT NULL DEFAULT false)",
-        "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"
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "id"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_TunnelConfig_name",
-            "unique": true,
-            "columnNames": [
-              "name"
-            ],
-            "orders": [],
-            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_TunnelConfig_name` ON `${TABLE_NAME}` (`name`)"
-          }
-        ],
-        "foreignKeys": []
-      }
-    ],
-    "views": [],
-    "setupQueries": [
-      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
-      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'e2c91dbf1885a9da592d3f54f1e08302')"
-    ]
-  }
-}

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

@@ -13,10 +13,10 @@ import org.junit.runner.RunWith
  */
 @RunWith(AndroidJUnit4::class)
 class ExampleInstrumentedTest {
-	@Test
+    @Test
-	fun useAppContext() {
+    fun useAppContext() {
-		// Context of the app under test.
+        // Context of the app under test.
-		val appContext = InstrumentationRegistry.getInstrumentation().targetContext
+        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
-		assertEquals("com.zaneschepke.wireguardautotunnel", appContext.packageName)
+        assertEquals("com.zaneschepke.wireguardautotunnel", appContext.packageName)
-	}
+    }
 }

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

@@ -4,7 +4,6 @@ import androidx.room.testing.MigrationTestHelper
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
 import com.zaneschepke.wireguardautotunnel.data.AppDatabase
-import com.zaneschepke.wireguardautotunnel.data.Queries
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -12,33 +11,59 @@ import java.io.IOException
 
 @RunWith(AndroidJUnit4::class)
 class MigrationTest {
-	private val dbName = "migration-test"
+    private val dbName = "migration-test"
 
-	@get:Rule
+    @get:Rule
-	val helper: MigrationTestHelper =
+    val helper: MigrationTestHelper =
-		MigrationTestHelper(
+        MigrationTestHelper(
-			InstrumentationRegistry.getInstrumentation(),
+            InstrumentationRegistry.getInstrumentation(),
-			AppDatabase::class.java,
+            AppDatabase::class.java,
-		)
+        )
 
-	@Test
+    @Test
-	@Throws(IOException::class)
+    @Throws(IOException::class)
-	fun migrate6To7() {
+    fun migrate4To5() {
-		helper.createDatabase(dbName, 6).apply {
+        helper.createDatabase(dbName, 4).apply {
-			// Database has schema version 1. Insert some data using SQL queries.
+            // Database has schema version 1. Insert some data using SQL queries.
-			// You can't use DAO classes because they expect the latest schema.
+            // You can't use DAO classes because they expect the latest schema.
-			execSQL(Queries.createDefaultSettings())
+            execSQL(
-			execSQL(
+                "INSERT INTO Settings (is_tunnel_enabled," +
-				Queries.createTunnelConfig(),
+                    "is_tunnel_on_mobile_data_enabled," +
-			)
+                    "trusted_network_ssids," +
-			// Prepare for the next version.
+                    "default_tunnel," +
-			close()
+                    "is_always_on_vpn_enabled," +
-		}
+                    "is_tunnel_on_ethernet_enabled," +
+                    "is_shortcuts_enabled," +
+                    "is_battery_saver_enabled," +
+                    "is_tunnel_on_wifi_enabled," +
+                    "is_kernel_enabled," +
+                    "is_restore_on_boot_enabled," +
+                    "is_multi_tunnel_enabled)" +
+                    " VALUES " +
+                    "('false'," +
+                    "'false'," +
+                    "'[trustedSSID1,trustedSSID2]'," +
+                    "'defaultTunnel'," +
+                    "'false'," +
+                    "'false'," +
+                    "'false'," +
+                    "'false'," +
+                    "'false'," +
+                    "'false'," +
+                    "'false'," +
+                    "'false')",
+            )
+            execSQL(
+                "INSERT INTO TunnelConfig (name, wg_quick)" + " VALUES ('hello', 'hello')",
+            )
+            // Prepare for the next version.
+            close()
+        }
 
-		// Re-open the database with version 2 and provide
+        // Re-open the database with version 2 and provide
-		// MIGRATION_1_2 as the migration process.
+        // MIGRATION_1_2 as the migration process.
-		helper.runMigrationsAndValidate(dbName, 7, true)
+        helper.runMigrationsAndValidate(dbName, 5, true)
-		// MigrationTestHelper automatically verifies the schema changes,
+        // MigrationTestHelper automatically verifies the schema changes,
-		// but you need to validate that the data was migrated properly.
+        // but you need to validate that the data was migrated properly.
-	}
+    }
 }

app/src/main/AndroidManifest.xml

@@ -23,6 +23,7 @@
     <!--foreground service exempt android 14-->
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SYSTEM_EXEMPTED" />
     <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE" />
 
     <!--foreground service permissions-->
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
@@ -31,12 +32,6 @@
     <!--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:icon="@mipmap/ic_launcher"
-		android:protectionLevel="dangerous" />
-
     <uses-feature
         android:name="android.software.leanback"
         android:required="false" />
@@ -57,8 +52,8 @@
     </queries>
     <application
         android:name=".WireGuardAutoTunnel"
-        android:allowBackup="false"
+        android:allowBackup="true"
-        android:banner="@drawable/ic_banner"
+        android:banner="@mipmap/ic_banner"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:enableOnBackInvokedCallback="true"
         android:fullBackupContent="@xml/backup_rules"
@@ -66,17 +61,18 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/Theme.AppSplashScreen"
+        android:theme="@style/Theme.WireguardAutoTunnel"
         tools:targetApi="tiramisu">
         <activity
-            android:name=".ui.SplashActivity"
+            android:name=".ui.MainActivity"
             android:exported="true"
-            android:theme="@style/Theme.AppSplashScreen">
+            android:theme="@style/Theme.WireguardAutoTunnel">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
                 <category android:name="android.intent.category.LEANBACK_LAUNCHER" />
+
                 <action android:name="android.service.quicksettings.action.QS_TILE_PREFERENCES" />
             </intent-filter>
             <meta-data
@@ -84,36 +80,29 @@
                 android:resource="@xml/shortcuts" />
         </activity>
         <activity
-            android:name=".ui.MainActivity"
+            android:name=".ui.CaptureActivityPortrait"
-            android:exported="true"
+            android:screenOrientation="fullSensor"
-            android:theme="@style/Theme.WireguardAutoTunnel">
+            android:stateNotNeeded="true"
-        </activity>
+            android:theme="@style/zxing_CaptureTheme"
-        <activity
+            android:windowSoftInputMode="stateAlwaysHidden" />
-            android:name="com.journeyapps.barcodescanner.CaptureActivity"
-            android:screenOrientation="portrait"
-            tools:replace="screenOrientation" />
-
         <activity
             android:name=".service.shortcut.ShortcutsActivity"
             android:enabled="true"
             android:exported="true"
-			android:noHistory="true"
+            android:finishOnTaskLaunch="true"
-			android:excludeFromRecents="true"
-			android:finishOnTaskLaunch="true"
-			android:launchMode="singleInstance"
             android:theme="@android:style/Theme.NoDisplay" />
 
         <service
             android:name=".service.foreground.ForegroundService"
             android:enabled="true"
             android:exported="false"
-            android:foregroundServiceType="systemExempted"
+            android:foregroundServiceType="systemExempted|specialUse"
             tools:node="merge" />
         <service
             android:name=".service.tile.TunnelControlTile"
             android:exported="true"
-            android:icon="@drawable/ic_launcher"
+            android:icon="@drawable/shield"
-            android:label="Tunnel control"
+            android:label="WG Tunnel"
             android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
             <meta-data
                 android:name="android.service.quicksettings.ACTIVE_TILE"
@@ -127,56 +116,29 @@
             </intent-filter>
         </service>
         <service
-            android:name=".service.tile.AutoTunnelControlTile"
+            android:name=".service.foreground.WireGuardTunnelService"
-            android:exported="true"
-            android:icon="@drawable/ic_launcher"
-            android:label="Auto-tunnel"
-            android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
-            <meta-data
-                android:name="android.service.quicksettings.ACTIVE_TILE"
-                android:value="true" />
-            <meta-data
-                android:name="android.service.quicksettings.TOGGLEABLE_TILE"
-                android:value="true" />
-
-            <intent-filter>
-                <action android:name="android.service.quicksettings.action.QS_TILE" />
-            </intent-filter>
-        </service>
-		<service
-			android:name=".service.tunnel.AlwaysOnVpnService"
-			android:enabled="true"
-			android:exported="false"
-			android:foregroundServiceType="systemExempted"
-			android:permission="android.permission.BIND_VPN_SERVICE"
-			android:persistent="true"
-			tools:node="merge">
-			<intent-filter>
-				<action android:name="android.net.VpnService" />
-			</intent-filter>
-			<meta-data
-				android:name="android.net.VpnService.SUPPORTS_ALWAYS_ON"
-				android:value="true" />
-		</service>
-        <service
-            android:name=".service.foreground.AutoTunnelService"
             android:enabled="true"
             android:exported="false"
-            android:foregroundServiceType="systemExempted"
+            android:foregroundServiceType="systemExempted|specialUse"
+            android:permission="android.permission.BIND_VPN_SERVICE"
+            android:persistent="true"
+            tools:node="merge">
+            <intent-filter>
+                <action android:name="android.net.VpnService" />
+            </intent-filter>
+            <meta-data
+                android:name="android.net.VpnService.SUPPORTS_ALWAYS_ON"
+                android:value="true" />
+        </service>
+        <service
+            android:name=".service.foreground.WireGuardConnectivityWatcherService"
+            android:enabled="true"
+            android:exported="false"
+            android:foregroundServiceType="systemExempted|specialUse"
             android:persistent="true"
             android:stopWithTask="false"
             tools:node="merge" />
 
-		<service
-			android:name=".service.foreground.TunnelBackgroundService"
-			android:exported="false"
-			android:foregroundServiceType="systemExempted"
-			android:permission="android.permission.BIND_VPN_SERVICE">
-			<intent-filter>
-				<action android:name="android.net.VpnService" />
-			</intent-filter>
-		</service>
-
         <receiver
             android:name=".receiver.BootReceiver"
             android:enabled="true"
@@ -190,24 +152,8 @@
                 <action android:name="com.htc.intent.action.QUICKBOOT_POWERON" />
             </intent-filter>
         </receiver>
-		<receiver
+        <receiver
-			android:name=".receiver.BackgroundActionReceiver"
+            android:name=".receiver.NotificationActionReceiver"
-			android:enabled="true"
+            android:exported="false" />
-			android:exported="false"/>
-		<receiver
-			android:name=".receiver.AppUpdateReceiver"
-			android:exported="false">
-			<intent-filter>
-				<action android:name="android.intent.action.MY_PACKAGE_REPLACED" />
-			</intent-filter>
-		</receiver>
-		<receiver
-			android:name=".receiver.KernelReceiver"
-			android:exported="false"
-			android:permission="${applicationId}.permission.CONTROL_TUNNELS">
-			<intent-filter>
-				<action android:name="com.wireguard.android.action.REFRESH_TUNNEL_STATES" />
-			</intent-filter>
-		</receiver>
     </application>
-</manifest>
+</manifest>

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

@@ -1,59 +1,34 @@
 package com.zaneschepke.wireguardautotunnel
 
 import android.app.Application
-import android.os.StrictMode
+import android.content.ComponentName
-import android.os.StrictMode.ThreadPolicy
+import android.content.pm.PackageManager
-import com.zaneschepke.logcatter.LocalLogCollector
+import android.service.quicksettings.TileService
-import com.zaneschepke.wireguardautotunnel.module.ApplicationScope
+import com.zaneschepke.wireguardautotunnel.service.tile.TunnelControlTile
-import com.zaneschepke.wireguardautotunnel.module.IoDispatcher
-import com.zaneschepke.wireguardautotunnel.util.ReleaseTree
-import com.zaneschepke.wireguardautotunnel.util.extensions.isRunningOnTv
 import dagger.hilt.android.HiltAndroidApp
-import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.launch
 import timber.log.Timber
-import javax.inject.Inject
 
 @HiltAndroidApp
 class WireGuardAutoTunnel : Application() {
+    override fun onCreate() {
+        super.onCreate()
+        instance = this
+        if (BuildConfig.DEBUG) Timber.plant(Timber.DebugTree())
+    }
 
-	@Inject
+    companion object {
-	@ApplicationScope
+        lateinit var instance: WireGuardAutoTunnel
-	lateinit var applicationScope: CoroutineScope
+            private set
 
-	@Inject
+        fun isRunningOnAndroidTv(): Boolean {
-	lateinit var localLogCollector: LocalLogCollector
+            return instance.packageManager.hasSystemFeature(PackageManager.FEATURE_LEANBACK)
+        }
 
-	@Inject
+        fun requestTileServiceStateUpdate() {
-	@IoDispatcher
+            TileService.requestListeningState(
-	lateinit var ioDispatcher: CoroutineDispatcher
+                instance,
-
+                ComponentName(instance, TunnelControlTile::class.java),
-	override fun onCreate() {
+            )
-		super.onCreate()
+        }
-		instance = this
+    }
-		if (BuildConfig.DEBUG) {
-			Timber.plant(Timber.DebugTree())
-			StrictMode.setThreadPolicy(
-				ThreadPolicy.Builder()
-					.detectDiskReads()
-					.detectDiskWrites()
-					.detectNetwork()
-					.penaltyLog()
-					.build(),
-			)
-		} else {
-			Timber.plant(ReleaseTree())
-		}
-		if (!isRunningOnTv()) {
-			applicationScope.launch(ioDispatcher) {
-				localLogCollector.start()
-			}
-		}
-	}
-
-	companion object {
-		lateinit var instance: WireGuardAutoTunnel
-			private set
-	}
 }

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

@@ -2,55 +2,32 @@ package com.zaneschepke.wireguardautotunnel.data
 
 import androidx.room.AutoMigration
 import androidx.room.Database
-import androidx.room.DeleteColumn
 import androidx.room.RoomDatabase
 import androidx.room.TypeConverters
-import androidx.room.migration.AutoMigrationSpec
+import com.zaneschepke.wireguardautotunnel.data.model.Settings
-import com.zaneschepke.wireguardautotunnel.data.domain.Settings
+import com.zaneschepke.wireguardautotunnel.data.model.TunnelConfig
-import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
 
 @Database(
-	entities = [Settings::class, TunnelConfig::class],
+    entities = [Settings::class, TunnelConfig::class],
-	version = 9,
+    version = 5,
-	autoMigrations =
+    autoMigrations =
-	[
+        [
-		AutoMigration(from = 1, to = 2),
+            AutoMigration(from = 1, to = 2),
-		AutoMigration(from = 2, to = 3),
+            AutoMigration(from = 2, to = 3),
-		AutoMigration(
+            AutoMigration(
-			from = 3,
+                from = 3,
-			to = 4,
+                to = 4,
-		),
+            ),
-		AutoMigration(
+            AutoMigration(
-			from = 4,
+                from = 4,
-			to = 5,
+                to = 5,
-		),
+            ),
-		AutoMigration(
+        ],
-			from = 5,
+    exportSchema = true,
-			to = 6,
-		),
-		AutoMigration(
-			from = 6,
-			to = 7,
-			spec = RemoveLegacySettingColumnsMigration::class,
-		),
-		AutoMigration(7, 8),
-		AutoMigration(8, 9),
-	],
-	exportSchema = true,
 )
 @TypeConverters(DatabaseListConverters::class)
 abstract class AppDatabase : RoomDatabase() {
-	abstract fun settingDao(): SettingsDao
+    abstract fun settingDao(): SettingsDao
 
-	abstract fun tunnelConfigDoa(): TunnelConfigDao
+    abstract fun tunnelConfigDoa(): TunnelConfigDao
 }
-
-@DeleteColumn(
-	tableName = "Settings",
-	columnName = "default_tunnel",
-)
-@DeleteColumn(
-	tableName = "Settings",
-	columnName = "is_battery_saver_enabled",
-)
-class RemoveLegacySettingColumnsMigration : AutoMigrationSpec

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

@@ -1,21 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.data
-
-import androidx.room.RoomDatabase
-import androidx.sqlite.db.SupportSQLiteDatabase
-import timber.log.Timber
-
-class DatabaseCallback : RoomDatabase.Callback() {
-	override fun onCreate(db: SupportSQLiteDatabase) = db.run {
-		// Notice non-ui thread is here
-		beginTransaction()
-		try {
-			execSQL(Queries.createDefaultSettings())
-			Timber.i("Bootstrapping settings data")
-			setTransactionSuccessful()
-		} catch (e: Exception) {
-			Timber.e(e)
-		} finally {
-			endTransaction()
-		}
-	}
-}

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

@@ -5,20 +5,20 @@ import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
 
 class DatabaseListConverters {
-	@TypeConverter
+    @TypeConverter
-	fun listToString(value: MutableList<String>): String {
+    fun listToString(value: MutableList<String>): String {
-		return Json.encodeToString(value)
+        return Json.encodeToString(value)
-	}
+    }
 
-	@TypeConverter
+    @TypeConverter
-	fun stringToList(value: String): MutableList<String> {
+    fun stringToList(value: String): MutableList<String> {
-		if (value.isBlank() || value.isEmpty()) return mutableListOf()
+        if (value.isEmpty()) return mutableListOf()
-		return try {
+        return try {
-			Json.decodeFromString<MutableList<String>>(value)
+            Json.decodeFromString<MutableList<String>>(value)
-		} catch (e: Exception) {
+        } catch (e: Exception) {
-			val list = value.split(",").toMutableList()
+            val list = value.split(",").toMutableList()
-			val json = listToString(list)
+            val json = listToString(list)
-			Json.decodeFromString<MutableList<String>>(json)
+            Json.decodeFromString<MutableList<String>>(json)
-		}
+        }
-	}
+    }
 }

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

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

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

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

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

@@ -5,51 +5,22 @@ import androidx.room.Delete
 import androidx.room.Insert
 import androidx.room.OnConflictStrategy
 import androidx.room.Query
-import com.zaneschepke.wireguardautotunnel.data.domain.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)
+    @Insert(onConflict = OnConflictStrategy.REPLACE) suspend fun save(t: TunnelConfig)
-	suspend fun save(t: TunnelConfig)
 
-	@Insert(onConflict = OnConflictStrategy.REPLACE)
+    @Insert(onConflict = OnConflictStrategy.REPLACE) suspend fun saveAll(t: List<TunnelConfig>)
-	suspend fun saveAll(t: TunnelConfigs)
 
-	@Query("SELECT * FROM TunnelConfig WHERE id=:id")
+    @Query("SELECT * FROM TunnelConfig WHERE id=:id") suspend fun getById(id: Long): TunnelConfig?
-	suspend fun getById(id: Long): TunnelConfig?
 
-	@Query("SELECT * FROM TunnelConfig WHERE name=:name")
+    @Query("SELECT * FROM TunnelConfig") suspend fun getAll(): List<TunnelConfig>
-	suspend fun getByName(name: String): TunnelConfig?
 
-	@Query("SELECT * FROM TunnelConfig WHERE is_Active=1")
+    @Delete suspend fun delete(t: TunnelConfig)
-	suspend fun getActive(): TunnelConfigs
 
-	@Query("SELECT * FROM TunnelConfig")
+    @Query("SELECT COUNT('id') FROM TunnelConfig") suspend fun count(): Long
-	suspend fun getAll(): TunnelConfigs
 
-	@Delete
+    @Query("SELECT * FROM tunnelconfig") fun getAllFlow(): Flow<MutableList<TunnelConfig>>
-	suspend fun delete(t: TunnelConfig)
-
-	@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
-
-	@Query("UPDATE TunnelConfig SET is_primary_tunnel = 0 WHERE is_primary_tunnel =1")
-	suspend fun resetPrimaryTunnel()
-
-	@Query("UPDATE TunnelConfig SET is_mobile_data_tunnel = 0 WHERE is_mobile_data_tunnel =1")
-	suspend fun resetMobileDataTunnel()
-
-	@Query("SELECT * FROM TUNNELCONFIG WHERE is_primary_tunnel=1")
-	suspend fun findByPrimary(): TunnelConfigs
-
-	@Query("SELECT * FROM TUNNELCONFIG WHERE is_mobile_data_tunnel=1")
-	suspend fun findByMobileDataTunnel(): TunnelConfigs
-
-	@Query("SELECT * FROM tunnelconfig")
-	fun getAllFlow(): Flow<MutableList<TunnelConfig>>
 }

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

@@ -4,76 +4,35 @@ import android.content.Context
 import androidx.datastore.preferences.core.Preferences
 import androidx.datastore.preferences.core.booleanPreferencesKey
 import androidx.datastore.preferences.core.edit
-import androidx.datastore.preferences.core.intPreferencesKey
-import androidx.datastore.preferences.core.stringPreferencesKey
 import androidx.datastore.preferences.preferencesDataStore
-import com.zaneschepke.wireguardautotunnel.module.IoDispatcher
-import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.runBlocking
-import kotlinx.coroutines.withContext
-import timber.log.Timber
-import java.io.IOException
 
-class DataStoreManager(
+class DataStoreManager(private val context: Context) {
-	private val context: Context,
+    companion object {
-	@IoDispatcher private val ioDispatcher: CoroutineDispatcher,
+        val LOCATION_DISCLOSURE_SHOWN = booleanPreferencesKey("LOCATION_DISCLOSURE_SHOWN")
-) {
+        val BATTERY_OPTIMIZE_DISABLE_SHOWN = booleanPreferencesKey("BATTERY_OPTIMIZE_DISABLE_SHOWN")
-	companion object {
+    }
-		val LOCATION_DISCLOSURE_SHOWN = booleanPreferencesKey("LOCATION_DISCLOSURE_SHOWN")
-		val BATTERY_OPTIMIZE_DISABLE_SHOWN = booleanPreferencesKey("BATTERY_OPTIMIZE_DISABLE_SHOWN")
-		val LAST_ACTIVE_TUNNEL = intPreferencesKey("LAST_ACTIVE_TUNNEL")
-		val CURRENT_SSID = stringPreferencesKey("CURRENT_SSID")
-		val IS_PIN_LOCK_ENABLED = booleanPreferencesKey("PIN_LOCK_ENABLED")
-	}
 
-	// preferences
+    // preferences
-	private val preferencesKey = "preferences"
+    private val preferencesKey = "preferences"
-	private val Context.dataStore by
+    private val Context.dataStore by
-		preferencesDataStore(
+        preferencesDataStore(
-			name = preferencesKey,
+            name = preferencesKey,
-		)
+        )
 
-	suspend fun init() {
+    suspend fun init() {
-		withContext(ioDispatcher) {
+        context.dataStore.data.first()
-			try {
+    }
-				context.dataStore.data.first()
-			} catch (e: IOException) {
-				Timber.e(e)
-			}
-		}
-	}
 
-	suspend fun <T> saveToDataStore(key: Preferences.Key<T>, value: T) {
+    suspend fun <T> saveToDataStore(key: Preferences.Key<T>, value: T) =
-		withContext(ioDispatcher) {
+        context.dataStore.edit { it[key] = value }
-			try {
-				context.dataStore.edit { it[key] = value }
-			} catch (e: IOException) {
-				Timber.e(e)
-			} catch (e: Exception) {
-				Timber.e(e)
-			}
-		}
-	}
 
-	fun <T> getFromStoreFlow(key: Preferences.Key<T>) = context.dataStore.data.map { it[key] }
+    fun <T> getFromStoreFlow(key: Preferences.Key<T>) = context.dataStore.data.map { it[key] }
 
-	suspend fun <T> getFromStore(key: Preferences.Key<T>): T? {
+    suspend fun <T> getFromStore(key: Preferences.Key<T>) =
-		return withContext(ioDispatcher) {
+        context.dataStore.data.first { it.contains(key) }[key]
-			try {
-				context.dataStore.data.map { it[key] }.first()
-			} catch (e: IOException) {
-				Timber.e(e)
-				null
-			}
-		}
-	}
 
-	fun <T> getFromStoreBlocking(key: Preferences.Key<T>) = runBlocking {
+    val preferencesFlow: Flow<Preferences?> = context.dataStore.data
-		context.dataStore.data.map { it[key] }.first()
-	}
-
-	val preferencesFlow: Flow<Preferences?> = context.dataStore.data
 }

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

@@ -1,14 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.data.domain
-
-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 lastActiveTunnelId: Int? = null,
-) {
-	companion object {
-		const val LOCATION_DISCLOSURE_SHOWN_DEFAULT = false
-		const val BATTERY_OPTIMIZATION_DISABLE_SHOWN_DEFAULT = false
-		const val PIN_LOCK_ENABLED_DEFAULT = false
-	}
-}

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

@@ -1,58 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.data.domain
-
-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_auto_tunnel_paused",
-		defaultValue = "false",
-	)
-	val isAutoTunnelPaused: Boolean = false,
-	@ColumnInfo(
-		name = "is_ping_enabled",
-		defaultValue = "false",
-	)
-	val isPingEnabled: Boolean = false,
-	@ColumnInfo(
-		name = "is_amnezia_enabled",
-		defaultValue = "false",
-	)
-	val isAmneziaEnabled: Boolean = false,
-)

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

@@ -1,62 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.data.domain
-
-import androidx.room.ColumnInfo
-import androidx.room.Entity
-import androidx.room.Index
-import androidx.room.PrimaryKey
-import com.wireguard.config.Config
-import java.io.InputStream
-
-@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,
-) {
-	companion object {
-		fun findDefault(tunnels: List<TunnelConfig>): TunnelConfig? {
-			return tunnels.find { it.isPrimaryTunnel } ?: tunnels.firstOrNull()
-		}
-
-		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)
-			}
-		}
-
-		const val AM_QUICK_DEFAULT = ""
-	}
-}

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

@@ -0,0 +1,63 @@
+package com.zaneschepke.wireguardautotunnel.data.model
+
+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") var isAutoTunnelEnabled: Boolean = false,
+    @ColumnInfo(name = "is_tunnel_on_mobile_data_enabled")
+    var isTunnelOnMobileDataEnabled: Boolean = false,
+    @ColumnInfo(name = "trusted_network_ssids")
+    var trustedNetworkSSIDs: MutableList<String> = mutableListOf(),
+    @ColumnInfo(name = "default_tunnel") var defaultTunnel: String? = null,
+    @ColumnInfo(name = "is_always_on_vpn_enabled") var isAlwaysOnVpnEnabled: Boolean = false,
+    @ColumnInfo(name = "is_tunnel_on_ethernet_enabled")
+    var isTunnelOnEthernetEnabled: Boolean = false,
+    @ColumnInfo(
+        name = "is_shortcuts_enabled",
+        defaultValue = "false",
+    )
+    var isShortcutsEnabled: Boolean = false,
+    @ColumnInfo(
+        name = "is_battery_saver_enabled",
+        defaultValue = "false",
+    )
+    var isBatterySaverEnabled: Boolean = false,
+    @ColumnInfo(
+        name = "is_tunnel_on_wifi_enabled",
+        defaultValue = "false",
+    )
+    var isTunnelOnWifiEnabled: Boolean = false,
+    @ColumnInfo(
+        name = "is_kernel_enabled",
+        defaultValue = "false",
+    )
+    var isKernelEnabled: Boolean = false,
+    @ColumnInfo(
+        name = "is_restore_on_boot_enabled",
+        defaultValue = "false",
+    )
+    var isRestoreOnBootEnabled: Boolean = false,
+    @ColumnInfo(
+        name = "is_multi_tunnel_enabled",
+        defaultValue = "false",
+    )
+    var isMultiTunnelEnabled: Boolean = false,
+    @ColumnInfo(
+        name = "is_auto_tunnel_paused",
+        defaultValue = "false",
+    )
+    var isAutoTunnelPaused: Boolean = false,
+) {
+    fun isTunnelConfigDefault(tunnelConfig: TunnelConfig): Boolean {
+        return if (defaultTunnel != null) {
+            val defaultConfig = TunnelConfig.from(defaultTunnel!!)
+            (tunnelConfig.id == defaultConfig.id)
+        } else {
+            false
+        }
+    }
+}

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

@@ -0,0 +1,34 @@
+package com.zaneschepke.wireguardautotunnel.data.model
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.Index
+import androidx.room.PrimaryKey
+import com.wireguard.config.Config
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.json.Json
+import java.io.InputStream
+
+@Entity(indices = [Index(value = ["name"], unique = true)])
+@Serializable
+data class TunnelConfig(
+    @PrimaryKey(autoGenerate = true) val id: Int = 0,
+    @ColumnInfo(name = "name") var name: String,
+    @ColumnInfo(name = "wg_quick") var wgQuick: String
+) {
+    override fun toString(): String {
+        return Json.encodeToString(serializer(), this)
+    }
+
+    companion object {
+        fun from(string: String): TunnelConfig {
+            return Json.decodeFromString<TunnelConfig>(string)
+        }
+
+        fun configFromQuick(wgQuick: String): Config {
+            val inputStream: InputStream = wgQuick.byteInputStream()
+            val reader = inputStream.bufferedReader(Charsets.UTF_8)
+            return Config.parse(reader)
+        }
+    }
+}

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

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

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

@@ -1,22 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.data.repository
-
-import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
-import javax.inject.Inject
-
-class AppDataRoomRepository
-@Inject
-constructor(
-	override val settings: SettingsRepository,
-	override val tunnels: TunnelConfigRepository,
-	override val appState: AppStateRepository,
-) : AppDataRepository {
-	override suspend fun getPrimaryOrFirstTunnel(): TunnelConfig? {
-		return tunnels.findPrimary().firstOrNull() ?: tunnels.getAll().firstOrNull()
-	}
-
-	override suspend fun getStartTunnelConfig(): TunnelConfig? {
-		return appState.getLastActiveTunnelId()?.let {
-			tunnels.getById(it)
-		} ?: getPrimaryOrFirstTunnel()
-	}
-}

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

@@ -1,28 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.data.repository
-
-import com.zaneschepke.wireguardautotunnel.data.domain.GeneralState
-import kotlinx.coroutines.flow.Flow
-
-interface AppStateRepository {
-	suspend fun isLocationDisclosureShown(): Boolean
-
-	suspend fun setLocationDisclosureShown(shown: Boolean)
-
-	suspend fun isPinLockEnabled(): Boolean
-
-	suspend fun setPinLockEnabled(enabled: Boolean)
-
-	suspend fun isBatteryOptimizationDisableShown(): Boolean
-
-	suspend fun setBatteryOptimizationDisableShown(shown: Boolean)
-
-	suspend fun getLastActiveTunnelId(): Int?
-
-	suspend fun setLastActiveTunnelId(id: Int)
-
-	suspend fun getCurrentSsid(): String?
-
-	suspend fun setCurrentSsid(ssid: String)
-
-	val generalStateFlow: Flow<GeneralState>
-}

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

@@ -1,88 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.data.repository
-
-import com.zaneschepke.wireguardautotunnel.data.datastore.DataStoreManager
-import com.zaneschepke.wireguardautotunnel.data.domain.GeneralState
-import com.zaneschepke.wireguardautotunnel.module.IoDispatcher
-import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.withContext
-import timber.log.Timber
-
-class DataStoreAppStateRepository(
-	private val dataStoreManager: DataStoreManager,
-	@IoDispatcher private val ioDispatcher: CoroutineDispatcher,
-) :
-	AppStateRepository {
-	override suspend fun isLocationDisclosureShown(): Boolean {
-		return withContext(ioDispatcher) {
-			dataStoreManager.getFromStore(DataStoreManager.LOCATION_DISCLOSURE_SHOWN)
-				?: GeneralState.LOCATION_DISCLOSURE_SHOWN_DEFAULT
-		}
-	}
-
-	override suspend fun setLocationDisclosureShown(shown: Boolean) {
-		withContext(ioDispatcher) { dataStoreManager.saveToDataStore(DataStoreManager.LOCATION_DISCLOSURE_SHOWN, shown) }
-	}
-
-	override suspend fun isPinLockEnabled(): Boolean {
-		return withContext(ioDispatcher) {
-			dataStoreManager.getFromStore(DataStoreManager.IS_PIN_LOCK_ENABLED)
-				?: GeneralState.PIN_LOCK_ENABLED_DEFAULT
-		}
-	}
-
-	override suspend fun setPinLockEnabled(enabled: Boolean) {
-		withContext(ioDispatcher) { dataStoreManager.saveToDataStore(DataStoreManager.IS_PIN_LOCK_ENABLED, enabled) }
-	}
-
-	override suspend fun isBatteryOptimizationDisableShown(): Boolean {
-		return withContext(ioDispatcher) {
-			dataStoreManager.getFromStore(DataStoreManager.BATTERY_OPTIMIZE_DISABLE_SHOWN)
-				?: GeneralState.BATTERY_OPTIMIZATION_DISABLE_SHOWN_DEFAULT
-		}
-	}
-
-	override suspend fun setBatteryOptimizationDisableShown(shown: Boolean) {
-		withContext(ioDispatcher) { dataStoreManager.saveToDataStore(DataStoreManager.BATTERY_OPTIMIZE_DISABLE_SHOWN, shown) }
-	}
-
-	override suspend fun getLastActiveTunnelId(): Int? {
-		return withContext(ioDispatcher) { dataStoreManager.getFromStore(DataStoreManager.LAST_ACTIVE_TUNNEL) }
-	}
-
-	override suspend fun setLastActiveTunnelId(id: Int) {
-		return withContext(ioDispatcher) { dataStoreManager.saveToDataStore(DataStoreManager.LAST_ACTIVE_TUNNEL, id) }
-	}
-
-	override suspend fun getCurrentSsid(): String? {
-		return withContext(ioDispatcher) { dataStoreManager.getFromStore(DataStoreManager.CURRENT_SSID) }
-	}
-
-	override suspend fun setCurrentSsid(ssid: String) {
-		withContext(ioDispatcher) { dataStoreManager.saveToDataStore(DataStoreManager.CURRENT_SSID, ssid) }
-	}
-
-	override val generalStateFlow: Flow<GeneralState> =
-		dataStoreManager.preferencesFlow.map { prefs ->
-			prefs?.let { pref ->
-				try {
-					GeneralState(
-						isLocationDisclosureShown =
-						pref[DataStoreManager.LOCATION_DISCLOSURE_SHOWN]
-							?: GeneralState.LOCATION_DISCLOSURE_SHOWN_DEFAULT,
-						isBatteryOptimizationDisableShown =
-						pref[DataStoreManager.BATTERY_OPTIMIZE_DISABLE_SHOWN]
-							?: GeneralState.BATTERY_OPTIMIZATION_DISABLE_SHOWN_DEFAULT,
-						isPinLockEnabled =
-						pref[DataStoreManager.IS_PIN_LOCK_ENABLED]
-							?: GeneralState.PIN_LOCK_ENABLED_DEFAULT,
-						lastActiveTunnelId = pref[DataStoreManager.LAST_ACTIVE_TUNNEL],
-					)
-				} catch (e: IllegalArgumentException) {
-					Timber.e(e)
-					GeneralState()
-				}
-			} ?: GeneralState()
-		}
-}

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

@@ -1,30 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.data.repository
-
-import com.zaneschepke.wireguardautotunnel.data.SettingsDao
-import com.zaneschepke.wireguardautotunnel.data.domain.Settings
-import com.zaneschepke.wireguardautotunnel.module.IoDispatcher
-import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.withContext
-
-class RoomSettingsRepository(private val settingsDoa: SettingsDao, @IoDispatcher private val ioDispatcher: CoroutineDispatcher) : SettingsRepository {
-	override suspend fun save(settings: Settings) {
-		withContext(ioDispatcher) {
-			settingsDoa.save(settings)
-		}
-	}
-
-	override fun getSettingsFlow(): Flow<Settings> {
-		return settingsDoa.getSettingsFlow()
-	}
-
-	override suspend fun getSettings(): Settings {
-		return withContext(ioDispatcher) {
-			settingsDoa.getAll().firstOrNull() ?: Settings()
-		}
-	}
-
-	override suspend fun getAll(): List<Settings> {
-		return withContext(ioDispatcher) { settingsDoa.getAll() }
-	}
-}

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

@@ -1,97 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.data.repository
-
-import com.zaneschepke.wireguardautotunnel.WireGuardAutoTunnel
-import com.zaneschepke.wireguardautotunnel.data.TunnelConfigDao
-import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
-import com.zaneschepke.wireguardautotunnel.module.IoDispatcher
-import com.zaneschepke.wireguardautotunnel.util.extensions.TunnelConfigs
-import com.zaneschepke.wireguardautotunnel.util.extensions.requestTunnelTileServiceStateUpdate
-import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.withContext
-
-class RoomTunnelConfigRepository(
-	private val tunnelConfigDao: TunnelConfigDao,
-	@IoDispatcher private val ioDispatcher: CoroutineDispatcher,
-) :
-	TunnelConfigRepository {
-	override fun getTunnelConfigsFlow(): Flow<TunnelConfigs> {
-		return tunnelConfigDao.getAllFlow()
-	}
-
-	override suspend fun getAll(): TunnelConfigs {
-		return withContext(ioDispatcher) { tunnelConfigDao.getAll() }
-	}
-
-	override suspend fun save(tunnelConfig: TunnelConfig) {
-		withContext(ioDispatcher) {
-			tunnelConfigDao.save(tunnelConfig)
-		}.also {
-			WireGuardAutoTunnel.instance.requestTunnelTileServiceStateUpdate()
-		}
-	}
-
-	override suspend fun updatePrimaryTunnel(tunnelConfig: TunnelConfig?) {
-		withContext(ioDispatcher) {
-			tunnelConfigDao.resetPrimaryTunnel()
-			tunnelConfig?.let {
-				save(
-					it.copy(
-						isPrimaryTunnel = true,
-					),
-				)
-			}
-		}
-	}
-
-	override suspend fun updateMobileDataTunnel(tunnelConfig: TunnelConfig?) {
-		withContext(ioDispatcher) {
-			tunnelConfigDao.resetMobileDataTunnel()
-			tunnelConfig?.let {
-				save(
-					it.copy(
-						isMobileDataTunnel = true,
-					),
-				)
-			}
-		}
-	}
-
-	override suspend fun delete(tunnelConfig: TunnelConfig) {
-		withContext(ioDispatcher) {
-			tunnelConfigDao.delete(tunnelConfig)
-		}.also {
-			WireGuardAutoTunnel.instance.requestTunnelTileServiceStateUpdate()
-		}
-	}
-
-	override suspend fun getById(id: Int): TunnelConfig? {
-		return withContext(ioDispatcher) { tunnelConfigDao.getById(id.toLong()) }
-	}
-
-	override suspend fun getActive(): TunnelConfigs {
-		return withContext(ioDispatcher) {
-			tunnelConfigDao.getActive()
-		}
-	}
-
-	override suspend fun count(): Int {
-		return withContext(ioDispatcher) { tunnelConfigDao.count().toInt() }
-	}
-
-	override suspend fun findByTunnelName(name: String): TunnelConfig? {
-		return withContext(ioDispatcher) { tunnelConfigDao.getByName(name) }
-	}
-
-	override suspend fun findByTunnelNetworksName(name: String): TunnelConfigs {
-		return withContext(ioDispatcher) { tunnelConfigDao.findByTunnelNetworkName(name) }
-	}
-
-	override suspend fun findByMobileDataTunnel(): TunnelConfigs {
-		return withContext(ioDispatcher) { tunnelConfigDao.findByMobileDataTunnel() }
-	}
-
-	override suspend fun findPrimary(): TunnelConfigs {
-		return withContext(ioDispatcher) { tunnelConfigDao.findByPrimary() }
-	}
-}

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

@@ -1,14 +1,14 @@
 package com.zaneschepke.wireguardautotunnel.data.repository
 
-import com.zaneschepke.wireguardautotunnel.data.domain.Settings
+import com.zaneschepke.wireguardautotunnel.data.model.Settings
 import kotlinx.coroutines.flow.Flow
 
 interface SettingsRepository {
-	suspend fun save(settings: Settings)
+    suspend fun save(settings: Settings)
 
-	fun getSettingsFlow(): Flow<Settings>
+    fun getSettingsFlow(): Flow<Settings>
 
-	suspend fun getSettings(): Settings
+    suspend fun getSettings(): Settings
 
-	suspend fun getAll(): List<Settings>
+    suspend fun getAll(): List<Settings>
 }

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

@@ -0,0 +1,24 @@
+package com.zaneschepke.wireguardautotunnel.data.repository
+
+import com.zaneschepke.wireguardautotunnel.data.SettingsDao
+import com.zaneschepke.wireguardautotunnel.data.model.Settings
+import kotlinx.coroutines.flow.Flow
+
+class SettingsRepositoryImpl(private val settingsDoa: SettingsDao) : SettingsRepository {
+
+    override suspend fun save(settings: Settings) {
+        settingsDoa.save(settings)
+    }
+
+    override fun getSettingsFlow(): Flow<Settings> {
+        return settingsDoa.getSettingsFlow()
+    }
+
+    override suspend fun getSettings(): Settings {
+        return settingsDoa.getAll().firstOrNull() ?: Settings()
+    }
+
+    override suspend fun getAll(): List<Settings> {
+        return settingsDoa.getAll()
+    }
+}

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

@@ -1,33 +1,18 @@
 package com.zaneschepke.wireguardautotunnel.data.repository
 
-import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
+import com.zaneschepke.wireguardautotunnel.data.model.TunnelConfig
-import com.zaneschepke.wireguardautotunnel.util.extensions.TunnelConfigs
+import com.zaneschepke.wireguardautotunnel.util.TunnelConfigs
 import kotlinx.coroutines.flow.Flow
 
 interface TunnelConfigRepository {
-	fun getTunnelConfigsFlow(): Flow<TunnelConfigs>
 
-	suspend fun getAll(): TunnelConfigs
+    fun getTunnelConfigsFlow(): Flow<TunnelConfigs>
 
-	suspend fun save(tunnelConfig: TunnelConfig)
+    suspend fun getAll(): TunnelConfigs
 
-	suspend fun updatePrimaryTunnel(tunnelConfig: TunnelConfig?)
+    suspend fun save(tunnelConfig: TunnelConfig)
 
-	suspend fun updateMobileDataTunnel(tunnelConfig: TunnelConfig?)
+    suspend fun delete(tunnelConfig: TunnelConfig)
 
-	suspend fun delete(tunnelConfig: TunnelConfig)
+    suspend fun count(): Int
-
-	suspend fun getById(id: Int): TunnelConfig?
-
-	suspend fun getActive(): TunnelConfigs
-
-	suspend fun count(): Int
-
-	suspend fun findByTunnelName(name: String): TunnelConfig?
-
-	suspend fun findByTunnelNetworksName(name: String): TunnelConfigs
-
-	suspend fun findByMobileDataTunnel(): TunnelConfigs
-
-	suspend fun findPrimary(): TunnelConfigs
 }

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

@@ -0,0 +1,29 @@
+package com.zaneschepke.wireguardautotunnel.data.repository
+
+import com.zaneschepke.wireguardautotunnel.data.TunnelConfigDao
+import com.zaneschepke.wireguardautotunnel.data.model.TunnelConfig
+import com.zaneschepke.wireguardautotunnel.util.TunnelConfigs
+import kotlinx.coroutines.flow.Flow
+
+class TunnelConfigRepositoryImpl(private val tunnelConfigDao: TunnelConfigDao) :
+    TunnelConfigRepository {
+    override fun getTunnelConfigsFlow(): Flow<TunnelConfigs> {
+        return tunnelConfigDao.getAllFlow()
+    }
+
+    override suspend fun getAll(): TunnelConfigs {
+        return tunnelConfigDao.getAll()
+    }
+
+    override suspend fun save(tunnelConfig: TunnelConfig) {
+        tunnelConfigDao.save(tunnelConfig)
+    }
+
+    override suspend fun delete(tunnelConfig: TunnelConfig) {
+        tunnelConfigDao.delete(tunnelConfig)
+    }
+
+    override suspend fun count(): Int {
+        return tunnelConfigDao.count().toInt()
+    }
+}

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

@@ -1,30 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.module
-
-import android.content.Context
-import com.zaneschepke.logcatter.LocalLogCollector
-import com.zaneschepke.logcatter.LogcatUtil
-import dagger.Module
-import dagger.Provides
-import dagger.hilt.InstallIn
-import dagger.hilt.android.qualifiers.ApplicationContext
-import dagger.hilt.components.SingletonComponent
-import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.SupervisorJob
-import javax.inject.Singleton
-
-@Module
-@InstallIn(SingletonComponent::class)
-class AppModule {
-	@Singleton
-	@ApplicationScope
-	@Provides
-	fun providesApplicationScope(@DefaultDispatcher defaultDispatcher: CoroutineDispatcher): CoroutineScope =
-		CoroutineScope(SupervisorJob() + defaultDispatcher)
-
-	@Singleton
-	@Provides
-	fun provideLogCollect(@ApplicationContext context: Context): LocalLogCollector {
-		return LogcatUtil.init(context = context)
-	}
-}

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

@@ -1,11 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.module
-
-import javax.inject.Qualifier
-
-@Qualifier
-@Retention(AnnotationRetention.BINARY)
-annotation class Kernel
-
-@Qualifier
-@Retention(AnnotationRetention.BINARY)
-annotation class Userspace

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

@@ -1,27 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.module
-
-import javax.inject.Qualifier
-
-@Retention(AnnotationRetention.RUNTIME)
-@Qualifier
-annotation class DefaultDispatcher
-
-@Retention(AnnotationRetention.RUNTIME)
-@Qualifier
-annotation class IoDispatcher
-
-@Retention(AnnotationRetention.RUNTIME)
-@Qualifier
-annotation class MainDispatcher
-
-@Retention(AnnotationRetention.BINARY)
-@Qualifier
-annotation class MainImmediateDispatcher
-
-@Retention(AnnotationRetention.RUNTIME)
-@Qualifier
-annotation class ApplicationScope
-
-@Retention(AnnotationRetention.RUNTIME)
-@Qualifier
-annotation class ServiceScope

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

@@ -1,28 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.module
-
-import dagger.Module
-import dagger.Provides
-import dagger.hilt.InstallIn
-import dagger.hilt.components.SingletonComponent
-import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.Dispatchers
-
-@Module
-@InstallIn(SingletonComponent::class)
-object CoroutinesDispatchersModule {
-	@DefaultDispatcher
-	@Provides
-	fun providesDefaultDispatcher(): CoroutineDispatcher = Dispatchers.Default
-
-	@IoDispatcher
-	@Provides
-	fun providesIoDispatcher(): CoroutineDispatcher = Dispatchers.IO
-
-	@MainDispatcher
-	@Provides
-	fun providesMainDispatcher(): CoroutineDispatcher = Dispatchers.Main
-
-	@MainImmediateDispatcher
-	@Provides
-	fun providesMainImmediateDispatcher(): CoroutineDispatcher = Dispatchers.Main.immediate
-}

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

@@ -0,0 +1,28 @@
+package com.zaneschepke.wireguardautotunnel.module
+
+import android.content.Context
+import androidx.room.Room
+import com.zaneschepke.wireguardautotunnel.R
+import com.zaneschepke.wireguardautotunnel.data.AppDatabase
+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
+
+@Module
+@InstallIn(SingletonComponent::class)
+class DatabaseModule {
+    @Provides
+    @Singleton
+    fun provideDatabase(@ApplicationContext context: Context): AppDatabase {
+        return Room.databaseBuilder(
+                context,
+                AppDatabase::class.java,
+                context.getString(R.string.db_name),
+            )
+            .fallbackToDestructiveMigration()
+            .build()
+    }
+}

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

@@ -0,0 +1,5 @@
+package com.zaneschepke.wireguardautotunnel.module
+
+import javax.inject.Qualifier
+
+@Qualifier @Retention(AnnotationRetention.BINARY) annotation class Kernel

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

@@ -1,88 +1,51 @@
 package com.zaneschepke.wireguardautotunnel.module
 
 import android.content.Context
-import androidx.room.Room
-import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.data.AppDatabase
-import com.zaneschepke.wireguardautotunnel.data.DatabaseCallback
 import com.zaneschepke.wireguardautotunnel.data.SettingsDao
 import com.zaneschepke.wireguardautotunnel.data.TunnelConfigDao
 import com.zaneschepke.wireguardautotunnel.data.datastore.DataStoreManager
-import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
-import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRoomRepository
-import com.zaneschepke.wireguardautotunnel.data.repository.AppStateRepository
-import com.zaneschepke.wireguardautotunnel.data.repository.DataStoreAppStateRepository
-import com.zaneschepke.wireguardautotunnel.data.repository.RoomSettingsRepository
-import com.zaneschepke.wireguardautotunnel.data.repository.RoomTunnelConfigRepository
 import com.zaneschepke.wireguardautotunnel.data.repository.SettingsRepository
+import com.zaneschepke.wireguardautotunnel.data.repository.SettingsRepositoryImpl
 import com.zaneschepke.wireguardautotunnel.data.repository.TunnelConfigRepository
+import com.zaneschepke.wireguardautotunnel.data.repository.TunnelConfigRepositoryImpl
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.android.qualifiers.ApplicationContext
 import dagger.hilt.components.SingletonComponent
-import kotlinx.coroutines.CoroutineDispatcher
 import javax.inject.Singleton
 
 @Module
 @InstallIn(SingletonComponent::class)
 class RepositoryModule {
-	@Provides
+    @Singleton
-	@Singleton
+    @Provides
-	fun provideDatabase(@ApplicationContext context: Context): AppDatabase {
+    fun provideSettingsDoa(appDatabase: AppDatabase): SettingsDao {
-		return Room.databaseBuilder(
+        return appDatabase.settingDao()
-			context,
+    }
-			AppDatabase::class.java,
-			context.getString(R.string.db_name),
-		)
-			.fallbackToDestructiveMigration()
-			.addCallback(DatabaseCallback())
-			.build()
-	}
 
-	@Singleton
+    @Singleton
-	@Provides
+    @Provides
-	fun provideSettingsDoa(appDatabase: AppDatabase): SettingsDao {
+    fun provideTunnelConfigDoa(appDatabase: AppDatabase): TunnelConfigDao {
-		return appDatabase.settingDao()
+        return appDatabase.tunnelConfigDoa()
-	}
+    }
 
-	@Singleton
+    @Singleton
-	@Provides
+    @Provides
-	fun provideTunnelConfigDoa(appDatabase: AppDatabase): TunnelConfigDao {
+    fun provideTunnelConfigRepository(tunnelConfigDao: TunnelConfigDao): TunnelConfigRepository {
-		return appDatabase.tunnelConfigDoa()
+        return TunnelConfigRepositoryImpl(tunnelConfigDao)
-	}
+    }
 
-	@Singleton
+    @Singleton
-	@Provides
+    @Provides
-	fun provideTunnelConfigRepository(tunnelConfigDao: TunnelConfigDao, @IoDispatcher ioDispatcher: CoroutineDispatcher): TunnelConfigRepository {
+    fun provideSettingsRepository(settingsDao: SettingsDao): SettingsRepository {
-		return RoomTunnelConfigRepository(tunnelConfigDao, ioDispatcher)
+        return SettingsRepositoryImpl(settingsDao)
-	}
+    }
 
-	@Singleton
+    @Singleton
-	@Provides
+    @Provides
-	fun provideSettingsRepository(settingsDao: SettingsDao, @IoDispatcher ioDispatcher: CoroutineDispatcher): SettingsRepository {
+    fun providePreferencesDataStore(@ApplicationContext context: Context): DataStoreManager {
-		return RoomSettingsRepository(settingsDao, ioDispatcher)
+        return DataStoreManager(context)
-	}
+    }
-
-	@Singleton
-	@Provides
-	fun providePreferencesDataStore(@ApplicationContext context: Context, @IoDispatcher ioDispatcher: CoroutineDispatcher): DataStoreManager {
-		return DataStoreManager(context, ioDispatcher)
-	}
-
-	@Provides
-	@Singleton
-	fun provideGeneralStateRepository(dataStoreManager: DataStoreManager, @IoDispatcher ioDispatcher: CoroutineDispatcher): AppStateRepository {
-		return DataStoreAppStateRepository(dataStoreManager, ioDispatcher)
-	}
-
-	@Provides
-	@Singleton
-	fun provideAppDataRepository(
-		settingsRepository: SettingsRepository,
-		tunnelConfigRepository: TunnelConfigRepository,
-		appStateRepository: AppStateRepository,
-	): AppDataRepository {
-		return AppDataRoomRepository(settingsRepository, tunnelConfigRepository, appStateRepository)
-	}
 }

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

@@ -15,19 +15,25 @@ import dagger.hilt.android.scopes.ServiceScoped
 @Module
 @InstallIn(ServiceComponent::class)
 abstract class ServiceModule {
-	@Binds
+    @Binds
-	@ServiceScoped
+    @ServiceScoped
-	abstract fun provideNotificationService(wireGuardNotification: WireGuardNotification): NotificationService
+    abstract fun provideNotificationService(
+        wireGuardNotification: WireGuardNotification
+    ): NotificationService
 
-	@Binds
+    @Binds
-	@ServiceScoped
+    @ServiceScoped
-	abstract fun provideWifiService(wifiService: WifiService): NetworkService<WifiService>
+    abstract fun provideWifiService(wifiService: WifiService): NetworkService<WifiService>
 
-	@Binds
+    @Binds
-	@ServiceScoped
+    @ServiceScoped
-	abstract fun provideMobileDataService(mobileDataService: MobileDataService): NetworkService<MobileDataService>
+    abstract fun provideMobileDataService(
+        mobileDataService: MobileDataService
+    ): NetworkService<MobileDataService>
 
-	@Binds
+    @Binds
-	@ServiceScoped
+    @ServiceScoped
-	abstract fun provideEthernetService(ethernetService: EthernetService): NetworkService<EthernetService>
+    abstract fun provideEthernetService(
+        ethernetService: EthernetService
+    ): NetworkService<EthernetService>
 }

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

@@ -3,82 +3,49 @@ package com.zaneschepke.wireguardautotunnel.module
 import android.content.Context
 import com.wireguard.android.backend.Backend
 import com.wireguard.android.backend.GoBackend
-import com.wireguard.android.backend.RootTunnelActionHandler
 import com.wireguard.android.backend.WgQuickBackend
 import com.wireguard.android.util.RootShell
 import com.wireguard.android.util.ToolsInstaller
-import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
+import com.zaneschepke.wireguardautotunnel.data.repository.SettingsRepository
-import com.zaneschepke.wireguardautotunnel.service.foreground.ServiceManager
+import com.zaneschepke.wireguardautotunnel.service.tunnel.VpnService
-import com.zaneschepke.wireguardautotunnel.service.tunnel.TunnelService
 import com.zaneschepke.wireguardautotunnel.service.tunnel.WireGuardTunnel
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.android.qualifiers.ApplicationContext
 import dagger.hilt.components.SingletonComponent
-import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.CoroutineScope
-import javax.inject.Provider
 import javax.inject.Singleton
 
 @Module
 @InstallIn(SingletonComponent::class)
 class TunnelModule {
-	@Provides
+    @Provides
-	@Singleton
+    @Singleton
-	fun provideRootShell(@ApplicationContext context: Context): RootShell {
+    fun provideRootShell(@ApplicationContext context: Context): RootShell {
-		return RootShell(context)
+        return RootShell(context)
-	}
+    }
 
-	@Provides
+    @Provides
-	@Singleton
+    @Singleton
-	fun provideRootShellAm(@ApplicationContext context: Context): org.amnezia.awg.util.RootShell {
+    @Userspace
-		return org.amnezia.awg.util.RootShell(context)
+    fun provideUserspaceBackend(@ApplicationContext context: Context): Backend {
-	}
+        return GoBackend(context)
+    }
 
-	@Provides
+    @Provides
-	@Singleton
+    @Singleton
-	@Userspace
+    @Kernel
-	fun provideUserspaceBackend(@ApplicationContext context: Context, rootShell: RootShell): Backend {
+    fun provideKernelBackend(@ApplicationContext context: Context, rootShell: RootShell): Backend {
-		return GoBackend(context, RootTunnelActionHandler(rootShell))
+        return WgQuickBackend(context, rootShell, ToolsInstaller(context, rootShell))
-	}
+    }
 
-	@Provides
+    @Provides
-	@Singleton
+    @Singleton
-	@Kernel
+    fun provideVpnService(
-	fun provideKernelBackend(@ApplicationContext context: Context, rootShell: RootShell): Backend {
+        @Userspace userspaceBackend: Backend,
-		return WgQuickBackend(context, rootShell, ToolsInstaller(context, rootShell), RootTunnelActionHandler(rootShell))
+        @Kernel kernelBackend: Backend,
-	}
+        settingsRepository: SettingsRepository
-
+    ): VpnService {
-	@Provides
+        return WireGuardTunnel(userspaceBackend, kernelBackend, settingsRepository)
-	@Singleton
+    }
-	fun provideAmneziaBackend(@ApplicationContext context: Context, rootShell: org.amnezia.awg.util.RootShell): org.amnezia.awg.backend.Backend {
-		return org.amnezia.awg.backend.GoBackend(context, org.amnezia.awg.backend.RootTunnelActionHandler(rootShell))
-	}
-
-	@Provides
-	@Singleton
-	fun provideVpnService(
-		amneziaBackend: Provider<org.amnezia.awg.backend.Backend>,
-		@Userspace userspaceBackend: Provider<Backend>,
-		@Kernel kernelBackend: Provider<Backend>,
-		appDataRepository: AppDataRepository,
-		@ApplicationScope applicationScope: CoroutineScope,
-		@IoDispatcher ioDispatcher: CoroutineDispatcher,
-	): TunnelService {
-		return WireGuardTunnel(
-			amneziaBackend,
-			userspaceBackend,
-			kernelBackend,
-			appDataRepository,
-			applicationScope,
-			ioDispatcher,
-		)
-	}
-
-	@Provides
-	@Singleton
-	fun provideServiceManager(): ServiceManager {
-		return ServiceManager()
-	}
 }

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

@@ -0,0 +1,5 @@
+package com.zaneschepke.wireguardautotunnel.module
+
+import javax.inject.Qualifier
+
+@Qualifier @Retention(AnnotationRetention.BINARY) annotation class Userspace

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

@@ -1,21 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.module
-
-import android.content.Context
-import com.zaneschepke.wireguardautotunnel.util.FileUtils
-import dagger.Module
-import dagger.Provides
-import dagger.hilt.InstallIn
-import dagger.hilt.android.components.ViewModelComponent
-import dagger.hilt.android.qualifiers.ApplicationContext
-import dagger.hilt.android.scopes.ViewModelScoped
-import kotlinx.coroutines.CoroutineDispatcher
-
-@Module
-@InstallIn(ViewModelComponent::class)
-class ViewModelModule {
-	@ViewModelScoped
-	@Provides
-	fun provideFileUtils(@ApplicationContext context: Context, @IoDispatcher ioDispatcher: CoroutineDispatcher): FileUtils {
-		return FileUtils(context, ioDispatcher)
-	}
-}

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

@@ -1,47 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.receiver
-
-import android.content.BroadcastReceiver
-import android.content.Context
-import android.content.Intent
-import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
-import com.zaneschepke.wireguardautotunnel.module.ApplicationScope
-import com.zaneschepke.wireguardautotunnel.service.foreground.ServiceManager
-import com.zaneschepke.wireguardautotunnel.service.tunnel.TunnelService
-import com.zaneschepke.wireguardautotunnel.util.extensions.startTunnelBackground
-import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.launch
-import timber.log.Timber
-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 tunnelService: TunnelService
-
-	override fun onReceive(context: Context, intent: Intent) {
-		if (intent.action != Intent.ACTION_MY_PACKAGE_REPLACED) return
-		applicationScope.launch {
-			val settings = appDataRepository.settings.getSettings()
-			if (settings.isAutoTunnelEnabled) {
-				Timber.i("Restarting services after upgrade")
-				serviceManager.startWatcherServiceForeground(context)
-			}
-			if (!settings.isAutoTunnelEnabled || settings.isAutoTunnelPaused) {
-				val tunnels = appDataRepository.tunnels.getAll().filter { it.isActive }
-				if (tunnels.isNotEmpty()) context.startTunnelBackground(tunnels.first().id)
-			}
-		}
-	}
-}

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

@@ -1,64 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.receiver
-
-import android.content.BroadcastReceiver
-import android.content.Context
-import android.content.Intent
-import com.zaneschepke.wireguardautotunnel.data.repository.TunnelConfigRepository
-import com.zaneschepke.wireguardautotunnel.module.ApplicationScope
-import com.zaneschepke.wireguardautotunnel.service.foreground.ServiceManager
-import com.zaneschepke.wireguardautotunnel.service.tunnel.TunnelService
-import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.launch
-import timber.log.Timber
-import javax.inject.Inject
-import javax.inject.Provider
-
-@AndroidEntryPoint
-class BackgroundActionReceiver : BroadcastReceiver() {
-
-	@Inject
-	@ApplicationScope
-	lateinit var applicationScope: CoroutineScope
-
-	@Inject
-	lateinit var tunnelService: Provider<TunnelService>
-
-	@Inject
-	lateinit var tunnelConfigRepository: TunnelConfigRepository
-
-	@Inject
-	lateinit var serviceManager: ServiceManager
-
-	override fun onReceive(context: Context, intent: Intent) {
-		val id = intent.getIntExtra(TUNNEL_ID_EXTRA_KEY, 0)
-		if (id == 0) return
-		when (intent.action) {
-			ACTION_CONNECT -> {
-				Timber.d("Connect actions")
-				applicationScope.launch {
-					val tunnel = tunnelConfigRepository.getById(id)
-					tunnel?.let {
-						serviceManager.startTunnelBackgroundService(context)
-						tunnelService.get().startTunnel(it)
-					}
-				}
-			}
-			ACTION_DISCONNECT -> {
-				applicationScope.launch {
-					val tunnel = tunnelConfigRepository.getById(id)
-					tunnel?.let {
-						serviceManager.stopTunnelBackgroundService(context)
-						tunnelService.get().stopTunnel(it)
-					}
-				}
-			}
-		}
-	}
-
-	companion object {
-		const val ACTION_CONNECT = "ACTION_CONNECT"
-		const val ACTION_DISCONNECT = "ACTION_DISCONNECT"
-		const val TUNNEL_ID_EXTRA_KEY = "tunnelId"
-	}
-}

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

@@ -3,46 +3,21 @@ package com.zaneschepke.wireguardautotunnel.receiver
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
-import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
+import com.zaneschepke.wireguardautotunnel.data.repository.SettingsRepository
-import com.zaneschepke.wireguardautotunnel.module.ApplicationScope
 import com.zaneschepke.wireguardautotunnel.service.foreground.ServiceManager
-import com.zaneschepke.wireguardautotunnel.service.tunnel.TunnelService
+import com.zaneschepke.wireguardautotunnel.util.goAsync
-import com.zaneschepke.wireguardautotunnel.util.extensions.startTunnelBackground
 import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.launch
-import timber.log.Timber
 import javax.inject.Inject
-import javax.inject.Provider
 
 @AndroidEntryPoint
 class BootReceiver : BroadcastReceiver() {
-	@Inject
-	lateinit var appDataRepository: AppDataRepository
 
-	@Inject
+    @Inject lateinit var settingsRepository: SettingsRepository
-	lateinit var tunnelService: Provider<TunnelService>
 
-	@Inject
+    override fun onReceive(context: Context?, intent: Intent?) = goAsync {
-	lateinit var serviceManager: ServiceManager
+        if (Intent.ACTION_BOOT_COMPLETED != intent?.action) return@goAsync
-
+        if (settingsRepository.getSettings().isAutoTunnelEnabled) {
-	@Inject
+            ServiceManager.startWatcherServiceForeground(context!!)
-	@ApplicationScope
+        }
-	lateinit var applicationScope: CoroutineScope
+    }
-
-	override fun onReceive(context: Context, intent: Intent) {
-		if (Intent.ACTION_BOOT_COMPLETED != intent.action) return
-		applicationScope.launch {
-			val settings = appDataRepository.settings.getSettings()
-			if (settings.isRestoreOnBootEnabled) {
-				appDataRepository.getStartTunnelConfig()?.let {
-					context.startTunnelBackground(it.id)
-				}
-			}
-			if (settings.isAutoTunnelEnabled) {
-				Timber.i("Starting watcher service from boot")
-				serviceManager.startWatcherServiceForeground(context)
-			}
-		}
-	}
 }

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

@@ -1,48 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.receiver
-
-import android.content.BroadcastReceiver
-import android.content.Context
-import android.content.Intent
-import com.zaneschepke.wireguardautotunnel.data.repository.TunnelConfigRepository
-import com.zaneschepke.wireguardautotunnel.module.ApplicationScope
-import com.zaneschepke.wireguardautotunnel.service.tunnel.TunnelService
-import com.zaneschepke.wireguardautotunnel.util.extensions.requestTunnelTileServiceStateUpdate
-import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.launch
-import javax.inject.Inject
-import javax.inject.Provider
-
-@AndroidEntryPoint
-class KernelReceiver : BroadcastReceiver() {
-
-	@Inject
-	lateinit var tunnelService: Provider<TunnelService>
-
-	@Inject
-	@ApplicationScope
-	lateinit var applicationScope: CoroutineScope
-
-	@Inject
-	lateinit var tunnelConfigRepository: TunnelConfigRepository
-
-	override fun onReceive(context: Context, intent: Intent) {
-		val action = intent.action ?: return
-		applicationScope.launch {
-			if (action == REFRESH_TUNNELS_ACTION) {
-				tunnelService.get().runningTunnelNames().forEach { name ->
-					// TODO can optimize later
-					val tunnel = tunnelConfigRepository.findByTunnelName(name)
-					tunnel?.let {
-						tunnelConfigRepository.save(it.copy(isActive = true))
-					}
-				}
-				context.requestTunnelTileServiceStateUpdate()
-			}
-		}
-	}
-
-	companion object {
-		const val REFRESH_TUNNELS_ACTION = "com.wireguard.android.action.REFRESH_TUNNEL_STATES"
-	}
-}

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

@@ -0,0 +1,31 @@
+package com.zaneschepke.wireguardautotunnel.receiver
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import com.zaneschepke.wireguardautotunnel.data.repository.SettingsRepository
+import com.zaneschepke.wireguardautotunnel.service.foreground.ServiceManager
+import com.zaneschepke.wireguardautotunnel.util.Constants
+import com.zaneschepke.wireguardautotunnel.util.goAsync
+import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.cancel
+import kotlinx.coroutines.delay
+import javax.inject.Inject
+
+@AndroidEntryPoint
+class NotificationActionReceiver : BroadcastReceiver() {
+    @Inject lateinit var settingsRepository: SettingsRepository
+
+    override fun onReceive(context: Context, intent: Intent?) = goAsync {
+        try {
+            val settings = settingsRepository.getSettings()
+            if (settings.defaultTunnel != null) {
+                ServiceManager.stopVpnService(context)
+                delay(Constants.TOGGLE_TUNNEL_DELAY)
+                ServiceManager.startVpnServiceForeground(context, settings.defaultTunnel.toString())
+            }
+        } finally {
+            cancel()
+        }
+    }
+}

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

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

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

@@ -1,467 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.service.foreground
-
-import android.content.Context
-import android.os.Bundle
-import android.os.PowerManager
-import androidx.core.app.ServiceCompat
-import androidx.lifecycle.lifecycleScope
-import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
-import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
-import com.zaneschepke.wireguardautotunnel.module.IoDispatcher
-import com.zaneschepke.wireguardautotunnel.module.MainImmediateDispatcher
-import com.zaneschepke.wireguardautotunnel.service.network.EthernetService
-import com.zaneschepke.wireguardautotunnel.service.network.MobileDataService
-import com.zaneschepke.wireguardautotunnel.service.network.NetworkService
-import com.zaneschepke.wireguardautotunnel.service.network.NetworkStatus
-import com.zaneschepke.wireguardautotunnel.service.network.WifiService
-import com.zaneschepke.wireguardautotunnel.service.notification.NotificationService
-import com.zaneschepke.wireguardautotunnel.service.tunnel.TunnelService
-import com.zaneschepke.wireguardautotunnel.service.tunnel.TunnelState
-import com.zaneschepke.wireguardautotunnel.util.Constants
-import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.collectLatest
-import kotlinx.coroutines.flow.update
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
-import timber.log.Timber
-import java.net.InetAddress
-import javax.inject.Inject
-import javax.inject.Provider
-
-@AndroidEntryPoint
-class AutoTunnelService : ForegroundService() {
-	private val foregroundId = 122
-
-	@Inject
-	lateinit var wifiService: NetworkService<WifiService>
-
-	@Inject
-	lateinit var mobileDataService: NetworkService<MobileDataService>
-
-	@Inject
-	lateinit var ethernetService: NetworkService<EthernetService>
-
-	@Inject
-	lateinit var appDataRepository: AppDataRepository
-
-	@Inject
-	lateinit var notificationService: NotificationService
-
-	@Inject
-	lateinit var tunnelService: Provider<TunnelService>
-
-	@Inject
-	@IoDispatcher
-	lateinit var ioDispatcher: CoroutineDispatcher
-
-	@Inject
-	@MainImmediateDispatcher
-	lateinit var mainImmediateDispatcher: CoroutineDispatcher
-
-	private val networkEventsFlow = MutableStateFlow(AutoTunnelState())
-
-	private var wakeLock: PowerManager.WakeLock? = null
-	private val tag = this.javaClass.name
-
-	private var running: Boolean = false
-
-	override fun onCreate() {
-		super.onCreate()
-		lifecycleScope.launch(mainImmediateDispatcher) {
-			kotlin.runCatching {
-				launchNotification()
-			}.onFailure {
-				Timber.e(it)
-			}
-		}
-	}
-
-	private suspend fun launchNotification() {
-		if (appDataRepository.settings.getSettings().isAutoTunnelPaused) {
-			launchWatcherPausedNotification()
-		} else {
-			launchWatcherNotification()
-		}
-	}
-
-	override fun startService(extras: Bundle?) {
-		super.startService(extras)
-		if (running) return
-		kotlin.runCatching {
-			lifecycleScope.launch(mainImmediateDispatcher) {
-				launchNotification()
-				initWakeLock()
-			}
-			startWatcherJob()
-		}.onFailure {
-			Timber.e(it)
-		}
-	}
-
-	override fun stopService() {
-		super.stopService()
-		wakeLock?.let {
-			if (it.isHeld) {
-				it.release()
-			}
-		}
-	}
-
-	private fun launchWatcherNotification(description: String = getString(R.string.watcher_notification_text_active)) {
-		val notification =
-			notificationService.createNotification(
-				channelId = getString(R.string.watcher_channel_id),
-				channelName = getString(R.string.watcher_channel_name),
-				title = getString(R.string.auto_tunnel_title),
-				description = description,
-			)
-		ServiceCompat.startForeground(
-			this,
-			foregroundId,
-			notification,
-			Constants.SYSTEM_EXEMPT_SERVICE_TYPE_ID,
-		)
-	}
-
-	private fun launchWatcherPausedNotification() {
-		launchWatcherNotification(getString(R.string.watcher_notification_text_paused))
-	}
-
-	private fun initWakeLock() {
-		wakeLock =
-			(getSystemService(Context.POWER_SERVICE) as PowerManager).run {
-				newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "$tag::lock").apply {
-					try {
-						Timber.i("Initiating wakelock with 10 min timeout")
-						acquire(Constants.BATTERY_SAVER_WATCHER_WAKE_LOCK_TIMEOUT)
-					} finally {
-						release()
-					}
-				}
-			}
-	}
-
-	private fun startWatcherJob() = lifecycleScope.launch {
-		val setting = appDataRepository.settings.getSettings()
-		launch {
-			Timber.i("Starting wifi watcher")
-			watchForWifiConnectivityChanges()
-		}
-		if (setting.isTunnelOnMobileDataEnabled) {
-			launch {
-				Timber.i("Starting mobile data watcher")
-				watchForMobileDataConnectivityChanges()
-			}
-		}
-		if (setting.isTunnelOnEthernetEnabled) {
-			launch {
-				Timber.i("Starting ethernet data watcher")
-				watchForEthernetConnectivityChanges()
-			}
-		}
-		launch {
-			Timber.i("Starting settings watcher")
-			watchForSettingsChanges()
-		}
-		if (setting.isPingEnabled) {
-			launch {
-				Timber.i("Starting ping watcher")
-				watchForPingFailure()
-			}
-		}
-		launch {
-			Timber.i("Starting management watcher")
-			manageVpn()
-		}
-		running = true
-	}
-
-	private suspend fun watchForMobileDataConnectivityChanges() {
-		withContext(ioDispatcher) {
-			mobileDataService.networkStatus.collect { status ->
-				when (status) {
-					is NetworkStatus.Available -> {
-						Timber.i("Gained Mobile data connection")
-						networkEventsFlow.update {
-							it.copy(
-								isMobileDataConnected = true,
-							)
-						}
-					}
-
-					is NetworkStatus.CapabilitiesChanged -> {
-						networkEventsFlow.update {
-							it.copy(
-								isMobileDataConnected = true,
-							)
-						}
-						Timber.i("Mobile data capabilities changed")
-					}
-
-					is NetworkStatus.Unavailable -> {
-						networkEventsFlow.update {
-							it.copy(
-								isMobileDataConnected = false,
-							)
-						}
-						Timber.i("Lost mobile data connection")
-					}
-				}
-			}
-		}
-	}
-
-	private suspend fun watchForPingFailure() {
-		withContext(ioDispatcher) {
-			try {
-				do {
-					if (tunnelService.get().vpnState.value.status == TunnelState.UP) {
-						val tunnelConfig = tunnelService.get().vpnState.value.tunnelConfig
-						tunnelConfig?.let {
-							val config = TunnelConfig.configFromWgQuick(it.wgQuick)
-							val results =
-								config.peers.map { peer ->
-									val host =
-										if (peer.endpoint.isPresent &&
-											peer.endpoint.get().resolved.isPresent
-										) {
-											peer.endpoint.get().resolved.get().host
-										} else {
-											Constants.DEFAULT_PING_IP
-										}
-									Timber.i("Checking reachability of: $host")
-									val reachable =
-										InetAddress.getByName(host)
-											.isReachable(Constants.PING_TIMEOUT.toInt())
-									Timber.i("Result: reachable - $reachable")
-									reachable
-								}
-							if (results.contains(false)) {
-								Timber.i("Restarting VPN for ping failure")
-								tunnelService.get().stopTunnel(it)
-								delay(Constants.VPN_RESTART_DELAY)
-								tunnelService.get().startTunnel(it)
-								delay(Constants.PING_COOLDOWN)
-							}
-						}
-					}
-					delay(Constants.PING_INTERVAL)
-				} while (true)
-			} catch (e: Exception) {
-				Timber.e(e)
-			}
-		}
-	}
-
-	private suspend fun watchForSettingsChanges() {
-		appDataRepository.settings.getSettingsFlow().collect { settings ->
-			if (networkEventsFlow.value.settings.isAutoTunnelPaused
-				!= settings.isAutoTunnelPaused
-			) {
-				when (settings.isAutoTunnelPaused) {
-					true -> launchWatcherPausedNotification()
-					false -> launchWatcherNotification()
-				}
-			}
-			networkEventsFlow.update {
-				it.copy(
-					settings = settings,
-				)
-			}
-		}
-	}
-
-	private suspend fun watchForEthernetConnectivityChanges() {
-		withContext(ioDispatcher) {
-			ethernetService.networkStatus.collect { status ->
-				when (status) {
-					is NetworkStatus.Available -> {
-						Timber.i("Gained Ethernet connection")
-						networkEventsFlow.update {
-							it.copy(
-								isEthernetConnected = true,
-							)
-						}
-					}
-
-					is NetworkStatus.CapabilitiesChanged -> {
-						Timber.i("Ethernet capabilities changed")
-						networkEventsFlow.update {
-							it.copy(
-								isEthernetConnected = true,
-							)
-						}
-					}
-
-					is NetworkStatus.Unavailable -> {
-						networkEventsFlow.update {
-							it.copy(
-								isEthernetConnected = false,
-							)
-						}
-						Timber.i("Lost Ethernet connection")
-					}
-				}
-			}
-		}
-	}
-
-	private suspend fun watchForWifiConnectivityChanges() {
-		withContext(ioDispatcher) {
-			wifiService.networkStatus.collect { status ->
-				when (status) {
-					is NetworkStatus.Available -> {
-						Timber.i("Gained Wi-Fi connection")
-						networkEventsFlow.update {
-							it.copy(
-								isWifiConnected = true,
-							)
-						}
-					}
-
-					is NetworkStatus.CapabilitiesChanged -> {
-						Timber.i("Wifi capabilities changed")
-						networkEventsFlow.update {
-							it.copy(
-								isWifiConnected = true,
-							)
-						}
-						val ssid = wifiService.getNetworkName(status.networkCapabilities)
-						ssid?.let { name ->
-							if (name.contains(Constants.UNREADABLE_SSID)) {
-								Timber.w("SSID unreadable: missing permissions")
-							} else {
-								Timber.i("Detected valid SSID")
-							}
-							appDataRepository.appState.setCurrentSsid(name)
-							networkEventsFlow.update {
-								it.copy(
-									currentNetworkSSID = name,
-								)
-							}
-						} ?: Timber.w("Failed to read ssid")
-					}
-
-					is NetworkStatus.Unavailable -> {
-						networkEventsFlow.update {
-							it.copy(
-								isWifiConnected = false,
-							)
-						}
-						Timber.i("Lost Wi-Fi connection")
-					}
-				}
-			}
-		}
-	}
-
-	private suspend fun getMobileDataTunnel(): TunnelConfig? {
-		return appDataRepository.tunnels.findByMobileDataTunnel().firstOrNull()
-	}
-
-	private suspend fun getSsidTunnel(ssid: String): TunnelConfig? {
-		return appDataRepository.tunnels.findByTunnelNetworksName(ssid).firstOrNull()
-	}
-
-	private fun isTunnelDown(): Boolean {
-		return tunnelService.get().vpnState.value.status == TunnelState.DOWN
-	}
-
-	private suspend fun manageVpn() {
-		withContext(ioDispatcher) {
-			networkEventsFlow.collectLatest { watcherState ->
-				val autoTunnel = "Auto-tunnel watcher"
-				if (!watcherState.settings.isAutoTunnelPaused) {
-					// delay for rapid network state changes and then collect latest
-					delay(Constants.WATCHER_COLLECTION_DELAY)
-					val activeTunnel = tunnelService.get().vpnState.value.tunnelConfig
-					val defaultTunnel = appDataRepository.getPrimaryOrFirstTunnel()
-					when {
-						watcherState.isEthernetConditionMet() -> {
-							Timber.i("$autoTunnel - tunnel on on ethernet condition met")
-							if (isTunnelDown()) {
-								defaultTunnel?.let {
-									tunnelService.get().startTunnel(it)
-								}
-							}
-						}
-
-						watcherState.isMobileDataConditionMet() -> {
-							Timber.i("$autoTunnel - tunnel on mobile data condition met")
-							val mobileDataTunnel = getMobileDataTunnel()
-							val tunnel =
-								mobileDataTunnel ?: defaultTunnel
-							if (isTunnelDown() || activeTunnel?.isMobileDataTunnel == false) {
-								tunnel?.let {
-									tunnelService.get().startTunnel(it)
-								}
-							}
-						}
-
-						watcherState.isTunnelOffOnMobileDataConditionMet() -> {
-							Timber.i("$autoTunnel - tunnel off on mobile data met, turning vpn off")
-							if (!isTunnelDown()) {
-								activeTunnel?.let {
-									tunnelService.get().stopTunnel(it)
-								}
-							}
-						}
-
-						watcherState.isUntrustedWifiConditionMet() -> {
-							if (activeTunnel?.tunnelNetworks?.contains(watcherState.currentNetworkSSID) == false ||
-								activeTunnel == null
-							) {
-								Timber.i(
-									"$autoTunnel - tunnel on ssid not associated with current tunnel condition met",
-								)
-								getSsidTunnel(watcherState.currentNetworkSSID)?.let {
-									Timber.i("Found tunnel associated with this SSID, bringing tunnel up: ${it.name}")
-									if (isTunnelDown() || activeTunnel?.id != it.id) {
-										tunnelService.get().startTunnel(it)
-									}
-								} ?: suspend {
-									Timber.i("No tunnel associated with this SSID, using defaults")
-									val default = appDataRepository.getPrimaryOrFirstTunnel()
-									if (default?.name != tunnelService.get().name || isTunnelDown()) {
-										default?.let {
-											tunnelService.get().startTunnel(it)
-										}
-									}
-								}.invoke()
-							}
-						}
-
-						watcherState.isTrustedWifiConditionMet() -> {
-							Timber.i(
-								"$autoTunnel - tunnel off on trusted wifi condition met, turning vpn off",
-							)
-							if (!isTunnelDown()) activeTunnel?.let { tunnelService.get().stopTunnel(it) }
-						}
-
-						watcherState.isTunnelOffOnWifiConditionMet() -> {
-							Timber.i(
-								"$autoTunnel - tunnel off on wifi condition met, turning vpn off",
-							)
-							if (!isTunnelDown()) activeTunnel?.let { tunnelService.get().stopTunnel(it) }
-						}
-
-						watcherState.isTunnelOffOnNoConnectivityMet() -> {
-							Timber.i(
-								"$autoTunnel - tunnel off on no connectivity met, turning vpn off",
-							)
-							if (!isTunnelDown()) activeTunnel?.let { tunnelService.get().stopTunnel(it) }
-						}
-
-						else -> {
-							Timber.i("$autoTunnel - no condition met")
-						}
-					}
-				}
-			}
-		}
-	}
-}

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

@@ -1,73 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.service.foreground
-
-import com.zaneschepke.wireguardautotunnel.data.domain.Settings
-
-data class AutoTunnelState(
-	val isWifiConnected: Boolean = false,
-	val isEthernetConnected: Boolean = false,
-	val isMobileDataConnected: Boolean = false,
-	val currentNetworkSSID: String = "",
-	val settings: Settings = Settings(),
-) {
-	fun isEthernetConditionMet(): Boolean {
-		return (
-			isEthernetConnected &&
-				settings.isTunnelOnEthernetEnabled
-			)
-	}
-
-	fun isMobileDataConditionMet(): Boolean {
-		return (
-			!isEthernetConnected &&
-				settings.isTunnelOnMobileDataEnabled &&
-				!isWifiConnected &&
-				isMobileDataConnected
-			)
-	}
-
-	fun isTunnelOffOnMobileDataConditionMet(): Boolean {
-		return (
-			!isEthernetConnected &&
-				!settings.isTunnelOnMobileDataEnabled &&
-				isMobileDataConnected &&
-				!isWifiConnected
-			)
-	}
-
-	fun isUntrustedWifiConditionMet(): Boolean {
-		return (
-			!isEthernetConnected &&
-				isWifiConnected &&
-				!settings.trustedNetworkSSIDs.contains(currentNetworkSSID) &&
-				settings.isTunnelOnWifiEnabled
-			)
-	}
-
-	fun isTrustedWifiConditionMet(): Boolean {
-		return (
-			!isEthernetConnected &&
-				(
-					isWifiConnected &&
-						settings.trustedNetworkSSIDs.contains(currentNetworkSSID)
-					)
-			)
-	}
-
-	fun isTunnelOffOnWifiConditionMet(): Boolean {
-		return (
-			!isEthernetConnected &&
-				(
-					isWifiConnected &&
-						!settings.isTunnelOnWifiEnabled
-					)
-			)
-	}
-
-	fun isTunnelOffOnNoConnectivityMet(): Boolean {
-		return (
-			!isEthernetConnected &&
-				!isWifiConnected &&
-				!isMobileDataConnected
-			)
-	}
-}

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

@@ -4,54 +4,60 @@ import android.content.Intent
 import android.os.Bundle
 import android.os.IBinder
 import androidx.lifecycle.LifecycleService
-import com.zaneschepke.wireguardautotunnel.util.Constants
 import timber.log.Timber
 
 open class ForegroundService : LifecycleService() {
-	private var isServiceStarted = false
+    private var isServiceStarted = false
 
-	override fun onBind(intent: Intent): IBinder? {
+    override fun onBind(intent: Intent): IBinder? {
-		super.onBind(intent)
+        super.onBind(intent)
-		// We don't provide binding, so return null
+        // We don't provide binding, so return null
-		return null
+        return null
-	}
+    }
 
-	override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
+    override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
-		super.onStartCommand(intent, flags, startId)
+        super.onStartCommand(intent, flags, startId)
-		Timber.d("onStartCommand executed with startId: $startId")
+        Timber.d("onStartCommand executed with startId: $startId")
-		if (intent != null) {
+        if (intent != null) {
-			val action = intent.action
+            val action = intent.action
-			when (action) {
+            when (action) {
-				Action.START.name,
+                Action.START.name,
-				Action.START_FOREGROUND.name,
+                Action.START_FOREGROUND.name -> startService(intent.extras)
-				-> startService(intent.extras)
+                Action.STOP.name -> stopService(intent.extras)
+                "android.net.VpnService" -> {
+                    Timber.d("Always-on VPN starting service")
+                    startService(intent.extras)
+                }
+                else -> Timber.d("This should never happen. No action in the received intent")
+            }
+        } else {
+            Timber.d(
+                "with a null intent. It has been probably restarted by the system.",
+            )
+        }
+        // by returning this we make sure the service is restarted if the system kills the service
+        return START_STICKY
+    }
 
-				Action.STOP.name, Action.STOP_FOREGROUND.name -> stopService()
+    override fun onDestroy() {
-				Constants.ALWAYS_ON_VPN_ACTION -> {
+        super.onDestroy()
-					Timber.i("Always-on VPN starting service")
+        Timber.d("The service has been destroyed")
-					startService(intent.extras)
+    }
-				}
 
-				else -> Timber.d("This should never happen. No action in the received intent")
+    protected open fun startService(extras: Bundle?) {
-			}
+        if (isServiceStarted) return
-		} else {
+        Timber.d("Starting ${this.javaClass.simpleName}")
-			Timber.d(
+        isServiceStarted = true
-				"with a null intent. It has been probably restarted by the system.",
+    }
-			)
-		}
-		return START_STICKY
-	}
 
-	protected open fun startService(extras: Bundle?) {
+    protected open fun stopService(extras: Bundle?) {
-		if (isServiceStarted) return
+        Timber.d("Stopping ${this.javaClass.simpleName}")
-		Timber.d("Starting ${this.javaClass.simpleName}")
+        try {
-		isServiceStarted = true
+            stopForeground(STOP_FOREGROUND_REMOVE)
-	}
+            stopSelf()
-
+        } catch (e: Exception) {
-	protected open fun stopService() {
+            Timber.d("Service stopped without being started: ${e.message}")
-		Timber.d("Stopping ${this.javaClass.simpleName}")
+        }
-		stopForeground(STOP_FOREGROUND_REMOVE)
+        isServiceStarted = false
-		stopSelf()
+    }
-		isServiceStarted = false
-	}
 }

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

@@ -3,67 +3,103 @@ package com.zaneschepke.wireguardautotunnel.service.foreground
 import android.app.Service
 import android.content.Context
 import android.content.Intent
+import com.zaneschepke.wireguardautotunnel.R
 import timber.log.Timber
 
-class ServiceManager {
+object ServiceManager {
-	private fun <T : Service> actionOnService(action: Action, context: Context, cls: Class<T>, extras: Map<String, Int>? = null) {
-		val intent =
-			Intent(context, cls).also {
-				it.action = action.name
-				extras?.forEach { (k, v) -> it.putExtra(k, v) }
-			}
-		intent.component?.javaClass
-		try {
-			when (action) {
-				Action.START_FOREGROUND, Action.STOP_FOREGROUND ->
-					context.startForegroundService(
-						intent,
-					)
 
-				Action.START, Action.STOP -> context.startService(intent)
+    //    private
-			}
+    //    fun <T> Context.isServiceRunning(service: Class<T>) =
-		} catch (e: Exception) {
+    //        (getSystemService(ACTIVITY_SERVICE) as ActivityManager)
-			Timber.e(e.message)
+    //            .runningAppProcesses.any {
-		}
+    //                it.processName == service.name
-	}
+    //            }
+    //
+    //    fun <T : Service> getServiceState(
+    //        context: Context,
+    //        cls: Class<T>
+    //    ): ServiceState {
+    //        val isServiceRunning = context.isServiceRunning(cls)
+    //        return if (isServiceRunning) ServiceState.STARTED else ServiceState.STOPPED
+    //    }
 
-	fun startWatcherServiceForeground(context: Context) {
+    private fun <T : Service> actionOnService(
-		actionOnService(
+        action: Action,
-			Action.START_FOREGROUND,
+        context: Context,
-			context,
+        cls: Class<T>,
-			AutoTunnelService::class.java,
+        extras: Map<String, String>? = null
-		)
+    ) {
-	}
+        val intent =
+            Intent(context, cls).also {
+                it.action = action.name
+                extras?.forEach { (k, v) -> it.putExtra(k, v) }
+            }
+        intent.component?.javaClass
+        try {
+            when (action) {
+                Action.START_FOREGROUND -> {
+                    context.startForegroundService(intent)
+                }
+                Action.START -> {
+                    context.startService(intent)
+                }
+                Action.STOP -> context.startService(intent)
+            }
+        } catch (e: Exception) {
+            Timber.e(e.message)
+        }
+    }
 
-	fun startWatcherService(context: Context) {
+    fun startVpnService(context: Context, tunnelConfig: String) {
-		actionOnService(
+        actionOnService(
-			Action.START,
+            Action.START,
-			context,
+            context,
-			AutoTunnelService::class.java,
+            WireGuardTunnelService::class.java,
-		)
+            mapOf(context.getString(R.string.tunnel_extras_key) to tunnelConfig),
-	}
+        )
+    }
 
-	fun stopWatcherService(context: Context) {
+    fun stopVpnService(context: Context) {
-		actionOnService(
+        Timber.d("Stopping vpn service action")
-			Action.STOP,
+        actionOnService(
-			context,
+            Action.STOP,
-			AutoTunnelService::class.java,
+            context,
-		)
+            WireGuardTunnelService::class.java,
-	}
+        )
+    }
 
-	fun startTunnelBackgroundService(context: Context) {
+    fun startVpnServiceForeground(context: Context, tunnelConfig: String) {
-		actionOnService(
+        actionOnService(
-			Action.START_FOREGROUND,
+            Action.START_FOREGROUND,
-			context,
+            context,
-			TunnelBackgroundService::class.java,
+            WireGuardTunnelService::class.java,
-		)
+            mapOf(context.getString(R.string.tunnel_extras_key) to tunnelConfig),
-	}
+        )
+    }
 
-	fun stopTunnelBackgroundService(context: Context) {
+    fun startWatcherServiceForeground(
-		actionOnService(
+        context: Context,
-			Action.STOP,
+    ) {
-			context,
+        actionOnService(
-			TunnelBackgroundService::class.java,
+            Action.START_FOREGROUND,
-		)
+            context,
-	}
+            WireGuardConnectivityWatcherService::class.java,
+        )
+    }
+
+    fun startWatcherService(context: Context) {
+        actionOnService(
+            Action.START,
+            context,
+            WireGuardConnectivityWatcherService::class.java,
+        )
+    }
+
+    fun stopWatcherService(context: Context) {
+        actionOnService(
+            Action.STOP,
+            context,
+            WireGuardConnectivityWatcherService::class.java,
+        )
+    }
 }

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

@@ -0,0 +1,6 @@
+package com.zaneschepke.wireguardautotunnel.service.foreground
+
+enum class ServiceState {
+    STARTED,
+    STOPPED,
+}

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

@@ -1,41 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.service.foreground
-
-import android.app.Notification
-import android.os.Bundle
-import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.service.notification.NotificationService
-import dagger.hilt.android.AndroidEntryPoint
-import javax.inject.Inject
-
-@AndroidEntryPoint
-class TunnelBackgroundService : ForegroundService() {
-
-	@Inject
-	lateinit var notificationService: NotificationService
-
-	private val foregroundId = 123
-
-	override fun onCreate() {
-		super.onCreate()
-		startForeground(foregroundId, createNotification())
-	}
-
-	override fun startService(extras: Bundle?) {
-		super.startService(extras)
-		startForeground(foregroundId, createNotification())
-	}
-
-	override fun stopService() {
-		super.stopService()
-		stopForeground(STOP_FOREGROUND_REMOVE)
-	}
-
-	private fun createNotification(): Notification {
-		return notificationService.createNotification(
-			getString(R.string.vpn_channel_id),
-			getString(R.string.vpn_channel_name),
-			getString(R.string.tunnel_start_text),
-			description = "",
-		)
-	}
-}

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

@@ -0,0 +1,394 @@
+package com.zaneschepke.wireguardautotunnel.service.foreground
+
+import android.app.AlarmManager
+import android.app.PendingIntent
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import android.os.PowerManager
+import android.os.SystemClock
+import androidx.core.app.ServiceCompat
+import androidx.lifecycle.lifecycleScope
+import com.wireguard.android.backend.Tunnel
+import com.zaneschepke.wireguardautotunnel.R
+import com.zaneschepke.wireguardautotunnel.data.model.Settings
+import com.zaneschepke.wireguardautotunnel.data.repository.SettingsRepository
+import com.zaneschepke.wireguardautotunnel.service.network.EthernetService
+import com.zaneschepke.wireguardautotunnel.service.network.MobileDataService
+import com.zaneschepke.wireguardautotunnel.service.network.NetworkService
+import com.zaneschepke.wireguardautotunnel.service.network.NetworkStatus
+import com.zaneschepke.wireguardautotunnel.service.network.WifiService
+import com.zaneschepke.wireguardautotunnel.service.notification.NotificationService
+import com.zaneschepke.wireguardautotunnel.service.tunnel.VpnService
+import com.zaneschepke.wireguardautotunnel.util.Constants
+import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.collectLatest
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import timber.log.Timber
+import javax.inject.Inject
+
+@AndroidEntryPoint
+class WireGuardConnectivityWatcherService : ForegroundService() {
+    private val foregroundId = 122
+
+    @Inject lateinit var wifiService: NetworkService<WifiService>
+
+    @Inject lateinit var mobileDataService: NetworkService<MobileDataService>
+
+    @Inject lateinit var ethernetService: NetworkService<EthernetService>
+
+    @Inject lateinit var settingsRepository: SettingsRepository
+
+    @Inject lateinit var notificationService: NotificationService
+
+    @Inject lateinit var vpnService: VpnService
+
+    private val networkEventsFlow = MutableStateFlow(WatcherState())
+
+    data class WatcherState(
+        val isWifiConnected: Boolean = false,
+        val isVpnConnected: Boolean = false,
+        val isEthernetConnected: Boolean = false,
+        val isMobileDataConnected: Boolean = false,
+        val currentNetworkSSID: String = "",
+        val settings: Settings = Settings()
+    )
+
+    private lateinit var watcherJob: Job
+
+    private var wakeLock: PowerManager.WakeLock? = null
+    private val tag = this.javaClass.name
+
+    override fun onCreate() {
+        super.onCreate()
+        lifecycleScope.launch(Dispatchers.Main) {
+            try {
+                if (settingsRepository.getSettings().isAutoTunnelPaused) {
+                    launchWatcherPausedNotification()
+                } else launchWatcherNotification()
+            } catch (e: Exception) {
+                Timber.e("Failed to start watcher service, not enough permissions")
+            }
+        }
+    }
+
+    override fun startService(extras: Bundle?) {
+        super.startService(extras)
+        try {
+            // we need this lock so our service gets not affected by Doze Mode
+            lifecycleScope.launch { initWakeLock() }
+            cancelWatcherJob()
+            startWatcherJob()
+        } catch (e: Exception) {
+            Timber.e("Failed to launch watcher service, no permissions")
+        }
+    }
+
+    override fun stopService(extras: Bundle?) {
+        super.stopService(extras)
+        wakeLock?.let {
+            if (it.isHeld) {
+                it.release()
+            }
+        }
+        cancelWatcherJob()
+        stopSelf()
+    }
+
+    private fun launchWatcherNotification(
+        description: String = getString(R.string.watcher_notification_text_active)
+    ) {
+        val notification =
+            notificationService.createNotification(
+                channelId = getString(R.string.watcher_channel_id),
+                channelName = getString(R.string.watcher_channel_name),
+                title = getString(R.string.auto_tunnel_title),
+                description = description,
+            )
+        ServiceCompat.startForeground(
+            this,
+            foregroundId,
+            notification,
+            Constants.SYSTEM_EXEMPT_SERVICE_TYPE_ID,
+        )
+    }
+
+    private fun launchWatcherPausedNotification() {
+        launchWatcherNotification(getString(R.string.watcher_notification_text_paused))
+    }
+
+    // TODO could this be restarting service in a bad state?
+    // try to start task again if killed
+    override fun onTaskRemoved(rootIntent: Intent) {
+        Timber.d("Task Removed called")
+        val restartServiceIntent = Intent(rootIntent)
+        val restartServicePendingIntent: PendingIntent =
+            PendingIntent.getService(
+                this,
+                1,
+                restartServiceIntent,
+                PendingIntent.FLAG_ONE_SHOT or PendingIntent.FLAG_IMMUTABLE,
+            )
+        applicationContext.getSystemService(Context.ALARM_SERVICE)
+        val alarmService: AlarmManager =
+            applicationContext.getSystemService(Context.ALARM_SERVICE) as AlarmManager
+        alarmService.set(
+            AlarmManager.ELAPSED_REALTIME,
+            SystemClock.elapsedRealtime() + 1000,
+            restartServicePendingIntent,
+        )
+    }
+
+    private suspend fun initWakeLock() {
+        val isBatterySaverOn =
+            withContext(lifecycleScope.coroutineContext) {
+                settingsRepository.getSettings().isBatterySaverEnabled
+            }
+        wakeLock =
+            (getSystemService(Context.POWER_SERVICE) as PowerManager).run {
+                newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "$tag::lock").apply {
+                    if (isBatterySaverOn) {
+                        Timber.d("Initiating wakelock with timeout")
+                        acquire(Constants.BATTERY_SAVER_WATCHER_WAKE_LOCK_TIMEOUT)
+                    } else {
+                        Timber.d("Initiating wakelock with zero timeout")
+                        acquire(Constants.DEFAULT_WATCHER_WAKE_LOCK_TIMEOUT)
+                    }
+                }
+            }
+    }
+
+    private fun cancelWatcherJob() {
+        if (this::watcherJob.isInitialized) {
+            watcherJob.cancel()
+        }
+    }
+
+    private fun startWatcherJob() {
+        watcherJob =
+            lifecycleScope.launch(Dispatchers.IO) {
+                val setting = settingsRepository.getSettings()
+                launch {
+                    Timber.d("Starting wifi watcher")
+                    watchForWifiConnectivityChanges()
+                }
+                if (setting.isTunnelOnMobileDataEnabled) {
+                    launch {
+                        Timber.d("Starting mobile data watcher")
+                        watchForMobileDataConnectivityChanges()
+                    }
+                }
+                if (setting.isTunnelOnEthernetEnabled) {
+                    launch {
+                        Timber.d("Starting ethernet data watcher")
+                        watchForEthernetConnectivityChanges()
+                    }
+                }
+                launch {
+                    Timber.d("Starting vpn state watcher")
+                    watchForVpnConnectivityChanges()
+                }
+                launch {
+                    Timber.d("Starting settings watcher")
+                    watchForSettingsChanges()
+                }
+                launch {
+                    Timber.d("Starting management watcher")
+                    manageVpn()
+                }
+            }
+    }
+
+    private suspend fun watchForMobileDataConnectivityChanges() {
+        mobileDataService.networkStatus.collect {
+            when (it) {
+                is NetworkStatus.Available -> {
+                    Timber.d("Gained Mobile data connection")
+                    networkEventsFlow.value =
+                        networkEventsFlow.value.copy(
+                            isMobileDataConnected = true,
+                        )
+                }
+                is NetworkStatus.CapabilitiesChanged -> {
+                    networkEventsFlow.value =
+                        networkEventsFlow.value.copy(
+                            isMobileDataConnected = true,
+                        )
+                    Timber.d("Mobile data capabilities changed")
+                }
+                is NetworkStatus.Unavailable -> {
+                    networkEventsFlow.value =
+                        networkEventsFlow.value.copy(
+                            isMobileDataConnected = false,
+                        )
+                    Timber.d("Lost mobile data connection")
+                }
+            }
+        }
+    }
+
+    private suspend fun watchForSettingsChanges() {
+        settingsRepository.getSettingsFlow().collect {
+            if (networkEventsFlow.value.settings.isAutoTunnelPaused != it.isAutoTunnelPaused) {
+                when (it.isAutoTunnelPaused) {
+                    true -> launchWatcherPausedNotification()
+                    false -> launchWatcherNotification()
+                }
+            }
+            networkEventsFlow.value =
+                networkEventsFlow.value.copy(
+                    settings = it,
+                )
+        }
+    }
+
+    private suspend fun watchForVpnConnectivityChanges() {
+        vpnService.vpnState.collect {
+            when (it.status) {
+                Tunnel.State.DOWN ->
+                    networkEventsFlow.value =
+                        networkEventsFlow.value.copy(
+                            isVpnConnected = false,
+                        )
+                Tunnel.State.UP ->
+                    networkEventsFlow.value =
+                        networkEventsFlow.value.copy(
+                            isVpnConnected = true,
+                        )
+                else -> {}
+            }
+        }
+    }
+
+    private suspend fun watchForEthernetConnectivityChanges() {
+        ethernetService.networkStatus.collect {
+            when (it) {
+                is NetworkStatus.Available -> {
+                    Timber.d("Gained Ethernet connection")
+                    networkEventsFlow.value =
+                        networkEventsFlow.value.copy(
+                            isEthernetConnected = true,
+                        )
+                }
+                is NetworkStatus.CapabilitiesChanged -> {
+                    Timber.d("Ethernet capabilities changed")
+                    networkEventsFlow.value =
+                        networkEventsFlow.value.copy(
+                            isEthernetConnected = true,
+                        )
+                }
+                is NetworkStatus.Unavailable -> {
+                    networkEventsFlow.value =
+                        networkEventsFlow.value.copy(
+                            isEthernetConnected = false,
+                        )
+                    Timber.d("Lost Ethernet connection")
+                }
+            }
+        }
+    }
+
+    private suspend fun watchForWifiConnectivityChanges() {
+        wifiService.networkStatus.collect {
+            when (it) {
+                is NetworkStatus.Available -> {
+                    Timber.d("Gained Wi-Fi connection")
+                    networkEventsFlow.value =
+                        networkEventsFlow.value.copy(
+                            isWifiConnected = true,
+                        )
+                }
+                is NetworkStatus.CapabilitiesChanged -> {
+                    Timber.d("Wifi capabilities changed")
+                    networkEventsFlow.value =
+                        networkEventsFlow.value.copy(
+                            isWifiConnected = true,
+                        )
+                    val ssid = wifiService.getNetworkName(it.networkCapabilities) ?: ""
+                    Timber.d("Detected SSID: $ssid")
+                    networkEventsFlow.value =
+                        networkEventsFlow.value.copy(
+                            currentNetworkSSID = ssid,
+                        )
+                }
+                is NetworkStatus.Unavailable -> {
+                    networkEventsFlow.value =
+                        networkEventsFlow.value.copy(
+                            isWifiConnected = false,
+                        )
+                    Timber.d("Lost Wi-Fi connection")
+                }
+            }
+        }
+    }
+
+    // TODO clean this up
+    private suspend fun manageVpn() {
+        networkEventsFlow.collectLatest {
+            Timber.i("New watcher state: $it")
+            if (!it.settings.isAutoTunnelPaused && it.settings.defaultTunnel != null) {
+                delay(Constants.TOGGLE_TUNNEL_DELAY)
+                when {
+                    ((it.isEthernetConnected &&
+                        it.settings.isTunnelOnEthernetEnabled &&
+                        !it.isVpnConnected)) -> {
+                        ServiceManager.startVpnServiceForeground(this, it.settings.defaultTunnel!!)
+                        Timber.i("Condition 1 met")
+                    }
+                    (!it.isEthernetConnected &&
+                        it.settings.isTunnelOnMobileDataEnabled &&
+                        !it.isWifiConnected &&
+                        it.isMobileDataConnected &&
+                        !it.isVpnConnected) -> {
+                        ServiceManager.startVpnServiceForeground(this, it.settings.defaultTunnel!!)
+                        Timber.i("Condition 2 met")
+                    }
+                    (!it.isEthernetConnected &&
+                        !it.settings.isTunnelOnMobileDataEnabled &&
+                        !it.isWifiConnected &&
+                        it.isVpnConnected) -> {
+                        ServiceManager.stopVpnService(this)
+                        Timber.i("Condition 3 met")
+                    }
+                    (!it.isEthernetConnected &&
+                        it.isWifiConnected &&
+                        !it.settings.trustedNetworkSSIDs.contains(it.currentNetworkSSID) &&
+                        it.settings.isTunnelOnWifiEnabled &&
+                        (!it.isVpnConnected)) -> {
+                        ServiceManager.startVpnServiceForeground(this, it.settings.defaultTunnel!!)
+                        Timber.i("Condition 4 met")
+                    }
+                    (!it.isEthernetConnected &&
+                        (it.isWifiConnected &&
+                            it.settings.trustedNetworkSSIDs.contains(it.currentNetworkSSID)) &&
+                        (it.isVpnConnected)) -> {
+                        ServiceManager.stopVpnService(this)
+                        Timber.i("Condition 5 met")
+                    }
+                    (!it.isEthernetConnected &&
+                        (it.isWifiConnected &&
+                            !it.settings.isTunnelOnWifiEnabled &&
+                            (it.isVpnConnected))) -> {
+                        ServiceManager.stopVpnService(this)
+                        Timber.i("Condition 6 met")
+                    }
+                    (!it.isEthernetConnected &&
+                        !it.isWifiConnected &&
+                        !it.isMobileDataConnected &&
+                        (it.isVpnConnected)) -> {
+                        ServiceManager.stopVpnService(this)
+                        Timber.i("Condition 7 met")
+                    }
+                    else -> {
+                        Timber.i("No condition met")
+                    }
+                }
+            }
+        }
+    }
+}

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

@@ -0,0 +1,183 @@
+package com.zaneschepke.wireguardautotunnel.service.foreground
+
+import android.app.PendingIntent
+import android.content.Intent
+import android.os.Bundle
+import androidx.core.app.ServiceCompat
+import androidx.lifecycle.lifecycleScope
+import com.zaneschepke.wireguardautotunnel.R
+import com.zaneschepke.wireguardautotunnel.data.model.TunnelConfig
+import com.zaneschepke.wireguardautotunnel.data.repository.SettingsRepository
+import com.zaneschepke.wireguardautotunnel.data.repository.TunnelConfigRepository
+import com.zaneschepke.wireguardautotunnel.receiver.NotificationActionReceiver
+import com.zaneschepke.wireguardautotunnel.service.notification.NotificationService
+import com.zaneschepke.wireguardautotunnel.service.tunnel.HandshakeStatus
+import com.zaneschepke.wireguardautotunnel.service.tunnel.VpnService
+import com.zaneschepke.wireguardautotunnel.util.Constants
+import com.zaneschepke.wireguardautotunnel.util.handshakeStatus
+import com.zaneschepke.wireguardautotunnel.util.mapPeerStats
+import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
+import timber.log.Timber
+import javax.inject.Inject
+
+@AndroidEntryPoint
+class WireGuardTunnelService : ForegroundService() {
+    private val foregroundId = 123
+
+    @Inject lateinit var vpnService: VpnService
+
+    @Inject lateinit var settingsRepository: SettingsRepository
+
+    @Inject lateinit var tunnelConfigRepository: TunnelConfigRepository
+
+    @Inject lateinit var notificationService: NotificationService
+
+    private lateinit var job: Job
+
+    private var tunnelName: String = ""
+    private var didShowConnected = false
+
+    override fun onCreate() {
+        super.onCreate()
+        lifecycleScope.launch(Dispatchers.Main) {
+            if (tunnelConfigRepository.getAll().isNotEmpty()) {
+                launchVpnNotification()
+            }
+        }
+    }
+
+    override fun startService(extras: Bundle?) {
+        super.startService(extras)
+        cancelJob()
+        val tunnelConfigString = extras?.getString(getString(R.string.tunnel_extras_key))
+        val tunnelConfig = tunnelConfigString?.let { TunnelConfig.from(it) }
+        tunnelName = tunnelConfig?.name ?: ""
+        job =
+            lifecycleScope.launch(Dispatchers.IO) {
+                launch {
+                    if (tunnelConfig != null) {
+                        try {
+                            tunnelName = tunnelConfig.name
+                            vpnService.startTunnel(tunnelConfig)
+                        } catch (e: Exception) {
+                            Timber.e("Problem starting tunnel: ${e.message}")
+                            stopService(extras)
+                        }
+                    } else {
+                        Timber.d("Tunnel config null, starting default tunnel or first")
+                        val settings = settingsRepository.getSettings()
+                        val tunnels = tunnelConfigRepository.getAll()
+                        if (settings.isAlwaysOnVpnEnabled) {
+                            val tunnel =
+                                if (settings.defaultTunnel != null) {
+                                    TunnelConfig.from(settings.defaultTunnel!!)
+                                } else if (tunnels.isNotEmpty()) {
+                                    tunnels.first()
+                                } else {
+                                    null
+                                }
+                            if (tunnel != null) {
+                                tunnelName = tunnel.name
+                                vpnService.startTunnel(tunnel)
+                            }
+                        }
+                    }
+                }
+                // TODO add failed to connect notification
+                launch {
+                    vpnService.vpnState.collect { state ->
+                        state.statistics
+                            ?.mapPeerStats()
+                            ?.map { it.value?.handshakeStatus() }
+                            .let { statuses ->
+                                when {
+                                    statuses?.all { it == HandshakeStatus.HEALTHY } == true -> {
+                                        if (!didShowConnected) {
+                                            delay(Constants.VPN_CONNECTED_NOTIFICATION_DELAY)
+                                            launchVpnNotification(
+                                                getString(R.string.tunnel_start_title),
+                                                "${getString(R.string.tunnel_start_text)} $tunnelName",
+                                            )
+                                            didShowConnected = true
+                                        }
+                                    }
+                                    statuses?.any { it == HandshakeStatus.STALE } == true -> {}
+                                    statuses?.all { it == HandshakeStatus.NOT_STARTED } ==
+                                        true -> {}
+                                    else -> {}
+                                }
+                            }
+                    }
+                }
+            }
+    }
+
+    override fun stopService(extras: Bundle?) {
+        super.stopService(extras)
+        lifecycleScope.launch(Dispatchers.IO) {
+            vpnService.stopTunnel()
+            didShowConnected = false
+        }
+        cancelJob()
+        stopSelf()
+    }
+
+    private fun launchVpnNotification(
+        title: String = getString(R.string.vpn_starting),
+        description: String = getString(R.string.attempt_connection)
+    ) {
+        val notification =
+            notificationService.createNotification(
+                channelId = getString(R.string.vpn_channel_id),
+                channelName = getString(R.string.vpn_channel_name),
+                title = title,
+                onGoing = false,
+                vibration = false,
+                showTimestamp = true,
+                description = description,
+            )
+        ServiceCompat.startForeground(
+            this,
+            foregroundId,
+            notification,
+            Constants.SYSTEM_EXEMPT_SERVICE_TYPE_ID,
+        )
+    }
+
+    private fun launchVpnConnectionFailedNotification(message: String) {
+        val notification =
+            notificationService.createNotification(
+                channelId = getString(R.string.vpn_channel_id),
+                channelName = getString(R.string.vpn_channel_name),
+                action =
+                    PendingIntent.getBroadcast(
+                        this,
+                        0,
+                        Intent(this, NotificationActionReceiver::class.java),
+                        PendingIntent.FLAG_IMMUTABLE,
+                    ),
+                actionText = getString(R.string.restart),
+                title = getString(R.string.vpn_connection_failed),
+                onGoing = false,
+                vibration = true,
+                showTimestamp = true,
+                description = message,
+            )
+        ServiceCompat.startForeground(
+            this,
+            foregroundId,
+            notification,
+            Constants.SYSTEM_EXEMPT_SERVICE_TYPE_ID,
+        )
+    }
+
+    private fun cancelJob() {
+        if (this::job.isInitialized) {
+            job.cancel()
+        }
+    }
+}

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

@@ -15,113 +15,117 @@ import kotlinx.coroutines.flow.callbackFlow
 import kotlinx.coroutines.flow.map
 
 abstract class BaseNetworkService<T : BaseNetworkService<T>>(
-	val context: Context,
+    val context: Context,
-	networkCapability: Int,
+    networkCapability: Int
 ) : NetworkService<T> {
-	private val connectivityManager =
+    private val connectivityManager =
-		context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
+        context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
 
-	private val wifiManager =
+    private val wifiManager =
-		context.applicationContext.getSystemService(Context.WIFI_SERVICE) as WifiManager
+        context.applicationContext.getSystemService(Context.WIFI_SERVICE) as WifiManager
 
-	override val networkStatus =
+    override val networkStatus = callbackFlow {
-		callbackFlow {
+        val networkStatusCallback =
-			val networkStatusCallback =
+            when (Build.VERSION.SDK_INT) {
-				when (Build.VERSION.SDK_INT) {
+                in Build.VERSION_CODES.S..Int.MAX_VALUE -> {
-					in Build.VERSION_CODES.S..Int.MAX_VALUE -> {
+                    object :
-						object :
+                        ConnectivityManager.NetworkCallback(
-							ConnectivityManager.NetworkCallback(
+                            FLAG_INCLUDE_LOCATION_INFO,
-								FLAG_INCLUDE_LOCATION_INFO,
+                        ) {
-							) {
+                        override fun onAvailable(network: Network) {
-							override fun onAvailable(network: Network) {
+                            trySend(NetworkStatus.Available(network))
-								trySend(NetworkStatus.Available(network))
+                        }
-							}
 
-							override fun onLost(network: Network) {
+                        override fun onLost(network: Network) {
-								trySend(NetworkStatus.Unavailable(network))
+                            trySend(NetworkStatus.Unavailable(network))
-							}
+                        }
 
-							override fun onCapabilitiesChanged(network: Network, networkCapabilities: NetworkCapabilities) {
+                        override fun onCapabilitiesChanged(
-								trySend(
+                            network: Network,
-									NetworkStatus.CapabilitiesChanged(
+                            networkCapabilities: NetworkCapabilities
-										network,
+                        ) {
-										networkCapabilities,
+                            trySend(
-									),
+                                NetworkStatus.CapabilitiesChanged(
-								)
+                                    network,
-							}
+                                    networkCapabilities,
-						}
+                                ),
-					}
+                            )
+                        }
+                    }
+                }
+                else -> {
+                    object : ConnectivityManager.NetworkCallback() {
+                        override fun onAvailable(network: Network) {
+                            trySend(NetworkStatus.Available(network))
+                        }
 
-					else -> {
+                        override fun onLost(network: Network) {
-						object : ConnectivityManager.NetworkCallback() {
+                            trySend(NetworkStatus.Unavailable(network))
-							override fun onAvailable(network: Network) {
+                        }
-								trySend(NetworkStatus.Available(network))
-							}
 
-							override fun onLost(network: Network) {
+                        override fun onCapabilitiesChanged(
-								trySend(NetworkStatus.Unavailable(network))
+                            network: Network,
-							}
+                            networkCapabilities: NetworkCapabilities
+                        ) {
+                            trySend(
+                                NetworkStatus.CapabilitiesChanged(
+                                    network,
+                                    networkCapabilities,
+                                ),
+                            )
+                        }
+                    }
+                }
+            }
+        val request =
+            NetworkRequest.Builder()
+                .addTransportType(networkCapability)
+                .addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
+                .addCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED)
+                .build()
+        connectivityManager.registerNetworkCallback(request, networkStatusCallback)
 
-							override fun onCapabilitiesChanged(network: Network, networkCapabilities: NetworkCapabilities) {
+        awaitClose { connectivityManager.unregisterNetworkCallback(networkStatusCallback) }
-								trySend(
+    }
-									NetworkStatus.CapabilitiesChanged(
-										network,
-										networkCapabilities,
-									),
-								)
-							}
-						}
-					}
-				}
-			val request =
-				NetworkRequest.Builder()
-					.addTransportType(networkCapability)
-					.addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
-					.addCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED)
-					.build()
-			connectivityManager.registerNetworkCallback(request, networkStatusCallback)
 
-			awaitClose { connectivityManager.unregisterNetworkCallback(networkStatusCallback) }
+    override fun getNetworkName(networkCapabilities: NetworkCapabilities): String? {
-		}
+        var ssid: String? = getWifiNameFromCapabilities(networkCapabilities)
+        if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.R) {
+            val info = wifiManager.connectionInfo
+            if (info.supplicantState === SupplicantState.COMPLETED) {
+                ssid = info.ssid
+            }
+        }
+        return ssid?.trim('"')
+    }
 
-	override fun getNetworkName(networkCapabilities: NetworkCapabilities): String? {
+    companion object {
-		var ssid: String? = getWifiNameFromCapabilities(networkCapabilities)
+        private fun getWifiNameFromCapabilities(networkCapabilities: NetworkCapabilities): String? {
-		if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.R) {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-			val info = wifiManager.connectionInfo
+                val info: WifiInfo
-			if (info.supplicantState === SupplicantState.COMPLETED) {
+                if (networkCapabilities.transportInfo is WifiInfo) {
-				ssid = info.ssid
+                    info = networkCapabilities.transportInfo as WifiInfo
-			}
+                    return info.ssid
-		}
+                }
-		return ssid?.trim('"')
+            }
-	}
+            return null
-
+        }
-	companion object {
+    }
-		private fun getWifiNameFromCapabilities(networkCapabilities: NetworkCapabilities): String? {
-			if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-				val info: WifiInfo
-				if (networkCapabilities.transportInfo is WifiInfo) {
-					info = networkCapabilities.transportInfo as WifiInfo
-					return info.ssid
-				}
-			}
-			return null
-		}
-	}
 }
 
 inline fun <Result> Flow<NetworkStatus>.map(
-	crossinline onUnavailable: suspend (network: Network) -> Result,
+    crossinline onUnavailable: suspend (network: Network) -> Result,
-	crossinline onAvailable: suspend (network: Network) -> Result,
+    crossinline onAvailable: suspend (network: Network) -> Result,
-	crossinline onCapabilitiesChanged:
+    crossinline onCapabilitiesChanged:
-	suspend (network: Network, networkCapabilities: NetworkCapabilities) -> Result,
+        suspend (network: Network, networkCapabilities: NetworkCapabilities) -> Result
 ): Flow<Result> = map { status ->
-	when (status) {
+    when (status) {
-		is NetworkStatus.Unavailable -> onUnavailable(status.network)
+        is NetworkStatus.Unavailable -> onUnavailable(status.network)
-		is NetworkStatus.Available -> onAvailable(status.network)
+        is NetworkStatus.Available -> onAvailable(status.network)
-		is NetworkStatus.CapabilitiesChanged ->
+        is NetworkStatus.CapabilitiesChanged ->
-			onCapabilitiesChanged(
+            onCapabilitiesChanged(
-				status.network,
+                status.network,
-				status.networkCapabilities,
+                status.networkCapabilities,
-			)
+            )
-	}
+    }
 }

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

@@ -5,9 +5,5 @@ import android.net.NetworkCapabilities
 import dagger.hilt.android.qualifiers.ApplicationContext
 import javax.inject.Inject
 
-class EthernetService
+class EthernetService @Inject constructor(@ApplicationContext context: Context) :
-@Inject
+    BaseNetworkService<EthernetService>(context, NetworkCapabilities.TRANSPORT_ETHERNET)
-constructor(
-	@ApplicationContext context: Context,
-) :
-	BaseNetworkService<EthernetService>(context, NetworkCapabilities.TRANSPORT_ETHERNET)

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

@@ -5,9 +5,5 @@ import android.net.NetworkCapabilities
 import dagger.hilt.android.qualifiers.ApplicationContext
 import javax.inject.Inject
 
-class MobileDataService
+class MobileDataService @Inject constructor(@ApplicationContext context: Context) :
-@Inject
+    BaseNetworkService<MobileDataService>(context, NetworkCapabilities.TRANSPORT_CELLULAR)
-constructor(
-	@ApplicationContext context: Context,
-) :
-	BaseNetworkService<MobileDataService>(context, NetworkCapabilities.TRANSPORT_CELLULAR)

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

@@ -4,7 +4,7 @@ import android.net.NetworkCapabilities
 import kotlinx.coroutines.flow.Flow
 
 interface NetworkService<T> {
-	fun getNetworkName(networkCapabilities: NetworkCapabilities): String?
+    fun getNetworkName(networkCapabilities: NetworkCapabilities): String?
 
-	val networkStatus: Flow<NetworkStatus>
+    val networkStatus: Flow<NetworkStatus>
 }

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

@@ -4,10 +4,10 @@ import android.net.Network
 import android.net.NetworkCapabilities
 
 sealed class NetworkStatus {
-	class Available(val network: Network) : NetworkStatus()
+    class Available(val network: Network) : NetworkStatus()
 
-	class Unavailable(val network: Network) : NetworkStatus()
+    class Unavailable(val network: Network) : NetworkStatus()
 
-	class CapabilitiesChanged(val network: Network, val networkCapabilities: NetworkCapabilities) :
+    class CapabilitiesChanged(val network: Network, val networkCapabilities: NetworkCapabilities) :
-		NetworkStatus()
+        NetworkStatus()
 }

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

@@ -5,9 +5,5 @@ import android.net.NetworkCapabilities
 import dagger.hilt.android.qualifiers.ApplicationContext
 import javax.inject.Inject
 
-class WifiService
+class WifiService @Inject constructor(@ApplicationContext context: Context) :
-@Inject
+    BaseNetworkService<WifiService>(context, NetworkCapabilities.TRANSPORT_WIFI)
-constructor(
-	@ApplicationContext context: Context,
-) :
-	BaseNetworkService<WifiService>(context, NetworkCapabilities.TRANSPORT_WIFI)

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

@@ -5,18 +5,18 @@ import android.app.NotificationManager
 import android.app.PendingIntent
 
 interface NotificationService {
-	fun createNotification(
+    fun createNotification(
-		channelId: String,
+        channelId: String,
-		channelName: String,
+        channelName: String,
-		title: String = "",
+        title: String = "",
-		action: PendingIntent? = null,
+        action: PendingIntent? = null,
-		actionText: String? = null,
+        actionText: String? = null,
-		description: String,
+        description: String,
-		showTimestamp: Boolean = false,
+        showTimestamp: Boolean = false,
-		importance: Int = NotificationManager.IMPORTANCE_HIGH,
+        importance: Int = NotificationManager.IMPORTANCE_HIGH,
-		vibration: Boolean = false,
+        vibration: Boolean = false,
-		onGoing: Boolean = true,
+        onGoing: Boolean = true,
-		lights: Boolean = true,
+        lights: Boolean = true,
-		onlyAlertOnce: Boolean = true,
+        onlyAlertOnce: Boolean = true,
-	): Notification
+    ): Notification
 }

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

@@ -9,97 +9,93 @@ import android.content.Intent
 import android.graphics.Color
 import androidx.core.app.NotificationCompat
 import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.ui.SplashActivity
+import com.zaneschepke.wireguardautotunnel.ui.MainActivity
 import dagger.hilt.android.qualifiers.ApplicationContext
 import javax.inject.Inject
 
-class WireGuardNotification
+class WireGuardNotification @Inject constructor(@ApplicationContext private val context: Context) :
-@Inject
+    NotificationService {
-constructor(
+    private val notificationManager =
-	@ApplicationContext private val context: Context,
+        context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
-) :
-	NotificationService {
-	private val notificationManager =
-		context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
 
-	private val watcherBuilder: NotificationCompat.Builder =
+    private val watcherBuilder: NotificationCompat.Builder =
-		NotificationCompat.Builder(
+        NotificationCompat.Builder(
-			context,
+            context,
-			context.getString(R.string.watcher_channel_id),
+            context.getString(R.string.watcher_channel_id),
-		)
+        )
-	private val tunnelBuilder: NotificationCompat.Builder =
+    private val tunnelBuilder: NotificationCompat.Builder =
-		NotificationCompat.Builder(
+        NotificationCompat.Builder(
-			context,
+            context,
-			context.getString(R.string.vpn_channel_id),
+            context.getString(R.string.vpn_channel_id),
-		)
+        )
 
-	override fun createNotification(
+    override fun createNotification(
-		channelId: String,
+        channelId: String,
-		channelName: String,
+        channelName: String,
-		title: String,
+        title: String,
-		action: PendingIntent?,
+        action: PendingIntent?,
-		actionText: String?,
+        actionText: String?,
-		description: String,
+        description: String,
-		showTimestamp: Boolean,
+        showTimestamp: Boolean,
-		importance: Int,
+        importance: Int,
-		vibration: Boolean,
+        vibration: Boolean,
-		onGoing: Boolean,
+        onGoing: Boolean,
-		lights: Boolean,
+        lights: Boolean,
-		onlyAlertOnce: Boolean,
+        onlyAlertOnce: Boolean,
-	): Notification {
+    ): Notification {
-		val channel =
+        val channel =
-			NotificationChannel(
+            NotificationChannel(
-				channelId,
+                    channelId,
-				channelName,
+                    channelName,
-				importance,
+                    importance,
-			)
+                )
-				.let {
+                .let {
-					it.description = title
+                    it.description = title
-					it.enableLights(lights)
+                    it.enableLights(lights)
-					it.lightColor = Color.RED
+                    it.lightColor = Color.RED
-					it.enableVibration(vibration)
+                    it.enableVibration(vibration)
-					it.vibrationPattern = longArrayOf(100, 200, 300)
+                    it.vibrationPattern = longArrayOf(100, 200, 300)
-					it
+                    it
-				}
+                }
-		notificationManager.createNotificationChannel(channel)
+        notificationManager.createNotificationChannel(channel)
-		val pendingIntent: PendingIntent =
+        val pendingIntent: PendingIntent =
-			Intent(context, SplashActivity::class.java).let { notificationIntent ->
+            Intent(context, MainActivity::class.java).let { notificationIntent ->
-				PendingIntent.getActivity(
+                PendingIntent.getActivity(
-					context,
+                    context,
-					0,
+                    0,
-					notificationIntent,
+                    notificationIntent,
-					PendingIntent.FLAG_IMMUTABLE,
+                    PendingIntent.FLAG_IMMUTABLE,
-				)
+                )
-			}
+            }
 
-		val builder =
+        val builder =
-			when (channelId) {
+            when (channelId) {
-				context.getString(R.string.watcher_channel_id) -> watcherBuilder
+                context.getString(R.string.watcher_channel_id) -> watcherBuilder
-				context.getString(R.string.vpn_channel_id) -> tunnelBuilder
+                context.getString(R.string.vpn_channel_id) -> tunnelBuilder
-				else -> {
+                else -> {
-					NotificationCompat.Builder(
+                    NotificationCompat.Builder(
-						context,
+                        context,
-						channelId,
+                        channelId,
-					)
+                    )
-				}
+                }
-			}
+            }
 
-		return builder.let {
+        return builder.let {
-			if (action != null && actionText != null) {
+            if (action != null && actionText != null) {
-				it.addAction(
+                it.addAction(
-					NotificationCompat.Action.Builder(0, actionText, action).build(),
+                    NotificationCompat.Action.Builder(0, actionText, action).build(),
-				)
+                )
-				it.setAutoCancel(true)
+                it.setAutoCancel(true)
-			}
+            }
-			it.setContentTitle(title)
+            it.setContentTitle(title)
-				.setContentText(description)
+                .setContentText(description)
-				.setOnlyAlertOnce(onlyAlertOnce)
+                .setOnlyAlertOnce(onlyAlertOnce)
-				.setContentIntent(pendingIntent)
+                .setContentIntent(pendingIntent)
-				.setOngoing(onGoing)
+                .setOngoing(onGoing)
-				.setPriority(NotificationCompat.PRIORITY_HIGH)
+                .setPriority(NotificationCompat.PRIORITY_HIGH)
-				.setShowWhen(showTimestamp)
+                .setShowWhen(showTimestamp)
-				.setSmallIcon(R.drawable.ic_launcher)
+                .setSmallIcon(R.mipmap.ic_launcher_foreground)
-				.build()
+                .build()
-		}
+        }
-	}
+    }
 }

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

@@ -1,81 +1,89 @@
 package com.zaneschepke.wireguardautotunnel.service.shortcut
 
 import android.os.Bundle
+import android.view.View
 import androidx.activity.ComponentActivity
-import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
+import androidx.lifecycle.lifecycleScope
-import com.zaneschepke.wireguardautotunnel.module.ApplicationScope
+import com.zaneschepke.wireguardautotunnel.data.model.TunnelConfig
+import com.zaneschepke.wireguardautotunnel.data.repository.SettingsRepository
+import com.zaneschepke.wireguardautotunnel.data.repository.TunnelConfigRepository
 import com.zaneschepke.wireguardautotunnel.service.foreground.Action
-import com.zaneschepke.wireguardautotunnel.service.foreground.AutoTunnelService
+import com.zaneschepke.wireguardautotunnel.service.foreground.ServiceManager
-import com.zaneschepke.wireguardautotunnel.service.tunnel.TunnelService
+import com.zaneschepke.wireguardautotunnel.service.foreground.WireGuardTunnelService
-import com.zaneschepke.wireguardautotunnel.util.extensions.startTunnelBackground
-import com.zaneschepke.wireguardautotunnel.util.extensions.stopTunnelBackground
 import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import timber.log.Timber
 import javax.inject.Inject
-import javax.inject.Provider
 
 @AndroidEntryPoint
 class ShortcutsActivity : ComponentActivity() {
-	@Inject
+    @Inject lateinit var settingsRepository: SettingsRepository
-	lateinit var appDataRepository: AppDataRepository
 
-	@Inject
+    @Inject lateinit var tunnelConfigRepository: TunnelConfigRepository
-	lateinit var tunnelService: Provider<TunnelService>
 
-	@Inject
+    private suspend fun toggleWatcherServicePause() {
-	@ApplicationScope
+        val settings = settingsRepository.getSettings()
-	lateinit var applicationScope: CoroutineScope
+        if (settings.isAutoTunnelEnabled) {
+            val pauseAutoTunnel = !settings.isAutoTunnelPaused
+            settingsRepository.save(
+                settings.copy(
+                    isAutoTunnelPaused = pauseAutoTunnel,
+                ),
+            )
+        }
+    }
 
-	override fun onCreate(savedInstanceState: Bundle?) {
+    override fun onCreate(savedInstanceState: Bundle?) {
-		super.onCreate(savedInstanceState)
+        super.onCreate(savedInstanceState)
-		applicationScope.launch {
+        setContentView(View(this))
-			val settings = appDataRepository.settings.getSettings()
+        if (
-			if (settings.isShortcutsEnabled) {
+            intent
-				when (intent.getStringExtra(CLASS_NAME_EXTRA_KEY)) {
+                .getStringExtra(CLASS_NAME_EXTRA_KEY)
-					LEGACY_TUNNEL_SERVICE_NAME, TunnelService::class.java.simpleName -> {
+                .equals(WireGuardTunnelService::class.java.simpleName)
-						val tunnelName = intent.getStringExtra(TUNNEL_NAME_EXTRA_KEY)
+        ) {
-						Timber.d("Tunnel name extra: $tunnelName")
+            lifecycleScope.launch(Dispatchers.Main) {
-						val tunnelConfig = tunnelName?.let {
+                val settings = settingsRepository.getSettings()
-							appDataRepository.tunnels.getAll()
+                if (settings.isShortcutsEnabled) {
-								.firstOrNull { it.name == tunnelName }
+                    try {
-						} ?: appDataRepository.getStartTunnelConfig()
+                        val tunnelName = intent.getStringExtra(TUNNEL_NAME_EXTRA_KEY)
-						Timber.d("Shortcut action on name: ${tunnelConfig?.name}")
+                        val tunnelConfig =
-						tunnelConfig?.let {
+                            if (tunnelName != null) {
-							when (intent.action) {
+                                tunnelConfigRepository.getAll().firstOrNull {
-								Action.START.name -> this@ShortcutsActivity.startTunnelBackground(it.id)
+                                    it.name == tunnelName
-								Action.STOP.name -> this@ShortcutsActivity.stopTunnelBackground(it.id)
+                                }
-								else -> Unit
+                            } else {
-							}
+                                if (settings.defaultTunnel == null) {
-						}
+                                    tunnelConfigRepository.getAll().first()
-					}
+                                } else {
-					AutoTunnelService::class.java.simpleName, LEGACY_AUTO_TUNNEL_SERVICE_NAME -> {
+                                    TunnelConfig.from(settings.defaultTunnel!!)
-						when (intent.action) {
+                                }
-							Action.START.name ->
+                            }
-								appDataRepository.settings.save(
+                        tunnelConfig ?: return@launch
-									settings.copy(
+                        toggleWatcherServicePause()
-										isAutoTunnelPaused = false,
+                        when (intent.action) {
-									),
+                            Action.STOP.name ->
-								)
+                                ServiceManager.stopVpnService(
-							Action.STOP.name ->
+                                    this@ShortcutsActivity,
-								appDataRepository.settings.save(
+                                )
-									settings.copy(
+                            Action.START.name ->
-										isAutoTunnelPaused = true,
+                                ServiceManager.startVpnServiceForeground(
-									),
+                                    this@ShortcutsActivity,
-								)
+                                    tunnelConfig.toString(),
-						}
+                                )
-					}
+                        }
-				}
+                    } catch (e: Exception) {
-			}
+                        Timber.e(e.message)
-		}
+                        finish()
-		finish()
+                    }
-	}
+                }
+            }
+        }
+        finish()
+    }
 
-	companion object {
+    companion object {
-		const val LEGACY_TUNNEL_SERVICE_NAME = "WireGuardTunnelService"
+        const val TUNNEL_NAME_EXTRA_KEY = "tunnelName"
-		const val LEGACY_AUTO_TUNNEL_SERVICE_NAME = "WireGuardConnectivityWatcherService"
+        const val CLASS_NAME_EXTRA_KEY = "className"
-		const val TUNNEL_NAME_EXTRA_KEY = "tunnelName"
+    }
-		const val CLASS_NAME_EXTRA_KEY = "className"
-	}
 }

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

@@ -1,149 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.service.tile
-
-import android.content.Intent
-import android.os.Build
-import android.os.IBinder
-import android.service.quicksettings.Tile
-import android.service.quicksettings.TileService
-import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.LifecycleOwner
-import androidx.lifecycle.LifecycleRegistry
-import androidx.lifecycle.lifecycleScope
-import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
-import com.zaneschepke.wireguardautotunnel.module.ApplicationScope
-import com.zaneschepke.wireguardautotunnel.service.foreground.ServiceManager
-import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.launch
-import timber.log.Timber
-import javax.inject.Inject
-
-@AndroidEntryPoint
-class AutoTunnelControlTile : TileService(), LifecycleOwner {
-	@Inject
-	lateinit var appDataRepository: AppDataRepository
-
-	@Inject
-	lateinit var serviceManager: ServiceManager
-
-	@Inject
-	@ApplicationScope
-	lateinit var applicationScope: CoroutineScope
-
-	private val lifecycleRegistry: LifecycleRegistry = LifecycleRegistry(this)
-
-	/* This works around an annoying unsolved frameworks bug some people are hitting. */
-	override fun onBind(intent: Intent): IBinder? {
-		var ret: IBinder? = null
-		try {
-			ret = super.onBind(intent)
-		} catch (e: Throwable) {
-			Timber.e("Failed to bind to AutoTunnelTile")
-		}
-		return ret
-	}
-
-	override fun onCreate() {
-		super.onCreate()
-		lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_CREATE)
-
-		applicationScope.launch {
-			appDataRepository.settings.getSettingsFlow().collect {
-				kotlin.runCatching {
-					when (it.isAutoTunnelEnabled) {
-						true -> {
-							if (it.isAutoTunnelPaused) {
-								setInactive()
-								setTileDescription(this@AutoTunnelControlTile.getString(R.string.paused))
-							} else {
-								setActive()
-								setTileDescription(this@AutoTunnelControlTile.getString(R.string.active))
-							}
-						}
-
-						false -> {
-							setTileDescription(this@AutoTunnelControlTile.getString(R.string.disabled))
-							setUnavailable()
-						}
-					}
-				}.onFailure {
-					Timber.e(it)
-				}
-			}
-		}
-	}
-
-	override fun onStopListening() {
-		lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_STOP)
-	}
-
-	override fun onDestroy() {
-		super.onDestroy()
-		lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_DESTROY)
-	}
-
-	override fun onStartListening() {
-		super.onStartListening()
-		lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_START)
-	}
-
-	override fun onClick() {
-		super.onClick()
-		unlockAndRun {
-			lifecycleScope.launch {
-				kotlin.runCatching {
-					val settings = appDataRepository.settings.getSettings()
-					if (settings.isAutoTunnelPaused) {
-						return@launch appDataRepository.settings.save(
-							settings.copy(
-								isAutoTunnelPaused = false,
-							),
-						)
-					}
-					appDataRepository.settings.save(
-						settings.copy(
-							isAutoTunnelPaused = true,
-						),
-					)
-				}
-			}
-		}
-	}
-
-	private fun setActive() {
-		kotlin.runCatching {
-			qsTile.state = Tile.STATE_ACTIVE
-			qsTile.updateTile()
-		}
-	}
-
-	private fun setInactive() {
-		kotlin.runCatching {
-			qsTile.state = Tile.STATE_INACTIVE
-			qsTile.updateTile()
-		}
-	}
-
-	private fun setUnavailable() {
-		kotlin.runCatching {
-			qsTile.state = Tile.STATE_UNAVAILABLE
-			qsTile.updateTile()
-		}
-	}
-
-	private fun setTileDescription(description: String) {
-		kotlin.runCatching {
-			if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-				qsTile.subtitle = description
-			}
-			if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-				qsTile.stateDescription = description
-			}
-			qsTile.updateTile()
-		}
-	}
-
-	override val lifecycle: Lifecycle
-		get() = lifecycleRegistry
-}

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

@@ -3,127 +3,131 @@ package com.zaneschepke.wireguardautotunnel.service.tile
 import android.os.Build
 import android.service.quicksettings.Tile
 import android.service.quicksettings.TileService
-import androidx.lifecycle.Lifecycle
+import com.wireguard.android.backend.Tunnel
-import androidx.lifecycle.LifecycleOwner
+import com.zaneschepke.wireguardautotunnel.data.model.TunnelConfig
-import androidx.lifecycle.LifecycleRegistry
+import com.zaneschepke.wireguardautotunnel.data.repository.SettingsRepository
-import androidx.lifecycle.lifecycleScope
+import com.zaneschepke.wireguardautotunnel.data.repository.TunnelConfigRepository
-import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
+import com.zaneschepke.wireguardautotunnel.service.foreground.ServiceManager
-import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
+import com.zaneschepke.wireguardautotunnel.service.tunnel.VpnService
-import com.zaneschepke.wireguardautotunnel.module.ApplicationScope
-import com.zaneschepke.wireguardautotunnel.service.tunnel.TunnelService
-import com.zaneschepke.wireguardautotunnel.util.extensions.startTunnelBackground
-import com.zaneschepke.wireguardautotunnel.util.extensions.stopTunnelBackground
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.cancel
 import kotlinx.coroutines.launch
 import timber.log.Timber
 import javax.inject.Inject
-import javax.inject.Provider
 
 @AndroidEntryPoint
-class TunnelControlTile : TileService(), LifecycleOwner {
+class TunnelControlTile() : TileService() {
-	@Inject
-	lateinit var appDataRepository: AppDataRepository
 
-	@Inject
+    @Inject lateinit var tunnelConfigRepository: TunnelConfigRepository
-	lateinit var tunnelService: Provider<TunnelService>
 
-	@Inject
+    @Inject lateinit var settingsRepository: SettingsRepository
-	@ApplicationScope
-	lateinit var applicationScope: CoroutineScope
 
-	private val lifecycleRegistry: LifecycleRegistry = LifecycleRegistry(this)
+    @Inject lateinit var vpnService: VpnService
 
-	override fun onCreate() {
+    private val scope = CoroutineScope(Dispatchers.IO)
-		super.onCreate()
-		Timber.d("onCreate for tile service")
-		lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_CREATE)
-	}
 
-	override fun onStopListening() {
+    private var tunnelName: String? = null
-		lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_STOP)
-	}
 
-	override fun onDestroy() {
+    override fun onStartListening() {
-		super.onDestroy()
+        super.onStartListening()
-		lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_DESTROY)
+        Timber.d("On start listening called")
-	}
+        scope.launch {
+            vpnService.vpnState.collect {
+                when (it.status) {
+                    Tunnel.State.UP -> setActive()
+                    Tunnel.State.DOWN -> setInactive()
+                    else -> setInactive()
+                }
+                val tunnels = tunnelConfigRepository.getAll()
+                if (tunnels.isEmpty()) {
+                    setUnavailable()
+                    return@collect
+                }
+                tunnelName =
+                    it.name.ifBlank {
+                        val settings = settingsRepository.getSettings()
+                        if (settings.defaultTunnel != null) {
+                            TunnelConfig.from(settings.defaultTunnel!!).name
+                        } else tunnels.firstOrNull()?.name
+                    }
+                setTileDescription(tunnelName ?: "")
+            }
+        }
+    }
 
-	override fun onStartListening() {
+    override fun onDestroy() {
-		super.onStartListening()
+        super.onDestroy()
-		lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_START)
+        scope.cancel()
-		lifecycleScope.launch {
+    }
-			if (appDataRepository.tunnels.getAll().isEmpty()) return@launch setUnavailable()
-			updateTileState()
-		}
-	}
 
-	private suspend fun updateTileState() {
+    override fun onTileRemoved() {
-		val lastActive = appDataRepository.getStartTunnelConfig()
+        super.onTileRemoved()
-		lastActive?.let {
+        scope.cancel()
-			updateTile(it)
+    }
-		}
-	}
 
-	override fun onClick() {
+    override fun onClick() {
-		super.onClick()
+        super.onClick()
-		unlockAndRun {
+        unlockAndRun {
-			Timber.d("Click")
+            scope.launch {
-			lifecycleScope.launch {
+                try {
-				val context = this@TunnelControlTile
+                    val tunnelConfig =
-				val lastActive = appDataRepository.getStartTunnelConfig()
+                        tunnelConfigRepository.getAll().first { it.name == tunnelName }
-				lastActive?.let { tunnel ->
+                    toggleWatcherServicePause()
-					if (tunnel.isActive) return@launch context.stopTunnelBackground(tunnel.id)
+                    if (vpnService.getState() == Tunnel.State.UP) {
-					context.startTunnelBackground(tunnel.id)
+                        ServiceManager.stopVpnService(this@TunnelControlTile)
-				}
+                    } else {
-			}
+                        ServiceManager.startVpnServiceForeground(
-		}
+                            this@TunnelControlTile,
-	}
+                            tunnelConfig.toString(),
+                        )
+                    }
+                } catch (e: Exception) {
+                    Timber.e(e.message)
+                } finally {
+                    cancel()
+                }
+            }
+        }
+    }
 
-	private fun setActive() {
+    private fun toggleWatcherServicePause() {
-		kotlin.runCatching {
+        scope.launch {
-			qsTile.state = Tile.STATE_ACTIVE
+            val settings = settingsRepository.getSettings()
-			qsTile.updateTile()
+            if (settings.isAutoTunnelEnabled) {
-		}
+                val pauseAutoTunnel = !settings.isAutoTunnelPaused
-	}
+                settingsRepository.save(
+                    settings.copy(
+                        isAutoTunnelPaused = pauseAutoTunnel,
+                    ),
+                )
+            }
+        }
+    }
 
-	private fun setInactive() {
+    private fun setActive() {
-		kotlin.runCatching {
+        qsTile.state = Tile.STATE_ACTIVE
-			qsTile.state = Tile.STATE_INACTIVE
+        qsTile.updateTile()
-			qsTile.updateTile()
+    }
-		}
-	}
 
-	private fun setUnavailable() {
+    private fun setInactive() {
-		kotlin.runCatching {
+        qsTile.state = Tile.STATE_INACTIVE
-			qsTile.state = Tile.STATE_UNAVAILABLE
+        qsTile.updateTile()
-			setTileDescription("")
+    }
-			qsTile.updateTile()
-		}
-	}
 
-	private fun setTileDescription(description: String) {
+    private fun setUnavailable() {
-		kotlin.runCatching {
+        qsTile.state = Tile.STATE_UNAVAILABLE
-			if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+        qsTile.updateTile()
-				qsTile.subtitle = description
+    }
-			}
-			if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-				qsTile.stateDescription = description
-			}
-			qsTile.updateTile()
-		}
-	}
 
-	private fun updateTile(tunnelConfig: TunnelConfig?) {
+    private fun setTileDescription(description: String) {
-		kotlin.runCatching {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-			tunnelConfig?.let {
+            qsTile.subtitle = description
-				setTileDescription(it.name)
+        }
-				if (it.isActive) return setActive()
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-				setInactive()
+            qsTile.stateDescription = description
-			}
+        }
-		}
+        qsTile.updateTile()
-	}
+    }
-
-	override val lifecycle: Lifecycle
-		get() = lifecycleRegistry
 }

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

@@ -1,46 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.service.tunnel
-
-import android.content.Intent
-import android.os.IBinder
-import androidx.lifecycle.LifecycleService
-import androidx.lifecycle.lifecycleScope
-import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
-import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.launch
-import timber.log.Timber
-import javax.inject.Inject
-import javax.inject.Provider
-
-@AndroidEntryPoint
-class AlwaysOnVpnService : LifecycleService() {
-
-	@Inject
-	lateinit var tunnelService: Provider<TunnelService>
-
-	@Inject
-	lateinit var appDataRepository: AppDataRepository
-
-	override fun onBind(intent: Intent): IBinder? {
-		super.onBind(intent)
-		// We don't provide binding, so return null
-		return null
-	}
-
-	override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
-		if (intent == null || intent.component == null || intent.component!!.packageName != packageName) {
-			Timber.i("Always-on VPN requested started")
-			lifecycleScope.launch {
-				val settings = appDataRepository.settings.getSettings()
-				if (settings.isAlwaysOnVpnEnabled) {
-					val tunnel = appDataRepository.getPrimaryOrFirstTunnel()
-					tunnel?.let {
-						tunnelService.get().startTunnel(it)
-					}
-				} else {
-					Timber.w("Always-on VPN is not enabled in app settings")
-				}
-			}
-		}
-		return super.onStartCommand(intent, flags, startId)
-	}
-}

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

@@ -1,17 +1,16 @@
 package com.zaneschepke.wireguardautotunnel.service.tunnel
 
 enum class HandshakeStatus {
-	HEALTHY,
+    HEALTHY,
-	STALE,
+    STALE,
-	UNKNOWN,
+    UNKNOWN,
-	NOT_STARTED,
+    NOT_STARTED;
-	;
 
-	companion object {
+    companion object {
-		private const val WG_TYPICAL_HANDSHAKE_INTERVAL_WHEN_HEALTHY_SEC = 180
+        private const val WG_TYPICAL_HANDSHAKE_INTERVAL_WHEN_HEALTHY_SEC = 180
-		const val STATUS_CHANGE_TIME_BUFFER = 30
+        const val STATUS_CHANGE_TIME_BUFFER = 30
-		const val STALE_TIME_LIMIT_SEC =
+        const val STALE_TIME_LIMIT_SEC =
-			WG_TYPICAL_HANDSHAKE_INTERVAL_WHEN_HEALTHY_SEC + STATUS_CHANGE_TIME_BUFFER
+            WG_TYPICAL_HANDSHAKE_INTERVAL_WHEN_HEALTHY_SEC + STATUS_CHANGE_TIME_BUFFER
-		const val NEVER_CONNECTED_TO_UNHEALTHY_TIME_LIMIT_SEC = 30
+        const val NEVER_CONNECTED_TO_UNHEALTHY_TIME_LIMIT_SEC = 30
-	}
+    }
 }

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

@@ -1,20 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.service.tunnel
-
-import com.wireguard.android.backend.Tunnel
-import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
-import kotlinx.coroutines.flow.StateFlow
-
-interface TunnelService : Tunnel, org.amnezia.awg.backend.Tunnel {
-	suspend fun startTunnel(tunnelConfig: TunnelConfig): Result<TunnelState>
-
-	suspend fun stopTunnel(tunnelConfig: TunnelConfig): Result<TunnelState>
-
-	val vpnState: StateFlow<VpnState>
-
-	suspend fun runningTunnelNames(): Set<String>
-
-	suspend fun getState(): TunnelState
-
-	fun cancelStatsJob()
-	fun startStatsJob()
-}

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

@@ -1,44 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.service.tunnel
-
-import com.wireguard.android.backend.Tunnel
-
-enum class TunnelState {
-	UP,
-	DOWN,
-	TOGGLE,
-	;
-
-	fun toWgState(): Tunnel.State {
-		return when (this) {
-			UP -> Tunnel.State.UP
-			DOWN -> Tunnel.State.DOWN
-			TOGGLE -> Tunnel.State.TOGGLE
-		}
-	}
-
-	fun toAmState(): org.amnezia.awg.backend.Tunnel.State {
-		return when (this) {
-			UP -> org.amnezia.awg.backend.Tunnel.State.UP
-			DOWN -> org.amnezia.awg.backend.Tunnel.State.DOWN
-			TOGGLE -> org.amnezia.awg.backend.Tunnel.State.TOGGLE
-		}
-	}
-
-	companion object {
-		fun from(state: Tunnel.State): TunnelState {
-			return when (state) {
-				Tunnel.State.DOWN -> DOWN
-				Tunnel.State.TOGGLE -> TOGGLE
-				Tunnel.State.UP -> UP
-			}
-		}
-
-		fun from(state: org.amnezia.awg.backend.Tunnel.State): TunnelState {
-			return when (state) {
-				org.amnezia.awg.backend.Tunnel.State.DOWN -> DOWN
-				org.amnezia.awg.backend.Tunnel.State.TOGGLE -> TOGGLE
-				org.amnezia.awg.backend.Tunnel.State.UP -> UP
-			}
-		}
-	}
-}

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

@@ -0,0 +1,15 @@
+package com.zaneschepke.wireguardautotunnel.service.tunnel
+
+import com.wireguard.android.backend.Tunnel
+import com.zaneschepke.wireguardautotunnel.data.model.TunnelConfig
+import kotlinx.coroutines.flow.StateFlow
+
+interface VpnService : Tunnel {
+    suspend fun startTunnel(tunnelConfig: TunnelConfig): Tunnel.State
+
+    suspend fun stopTunnel()
+
+    val vpnState: StateFlow<VpnState>
+
+    fun getState(): Tunnel.State
+}

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

@@ -1,10 +1,10 @@
 package com.zaneschepke.wireguardautotunnel.service.tunnel
 
-import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
+import com.wireguard.android.backend.Statistics
-import com.zaneschepke.wireguardautotunnel.service.tunnel.statistics.TunnelStatistics
+import com.wireguard.android.backend.Tunnel
 
 data class VpnState(
-	val status: TunnelState = TunnelState.DOWN,
+    val status: Tunnel.State = Tunnel.State.DOWN,
-	val tunnelConfig: TunnelConfig? = null,
+    val name: String = "",
-	val statistics: TunnelStatistics? = null,
+    val statistics: Statistics? = null
 )

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

@@ -1,202 +1,149 @@
 package com.zaneschepke.wireguardautotunnel.service.tunnel
 
 import com.wireguard.android.backend.Backend
+import com.wireguard.android.backend.BackendException
+import com.wireguard.android.backend.Statistics
 import com.wireguard.android.backend.Tunnel.State
+import com.wireguard.config.Config
 import com.zaneschepke.wireguardautotunnel.WireGuardAutoTunnel
-import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
+import com.zaneschepke.wireguardautotunnel.data.model.TunnelConfig
-import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
+import com.zaneschepke.wireguardautotunnel.data.repository.SettingsRepository
-import com.zaneschepke.wireguardautotunnel.module.ApplicationScope
-import com.zaneschepke.wireguardautotunnel.module.IoDispatcher
 import com.zaneschepke.wireguardautotunnel.module.Kernel
 import com.zaneschepke.wireguardautotunnel.module.Userspace
-import com.zaneschepke.wireguardautotunnel.service.tunnel.statistics.AmneziaStatistics
-import com.zaneschepke.wireguardautotunnel.service.tunnel.statistics.TunnelStatistics
-import com.zaneschepke.wireguardautotunnel.service.tunnel.statistics.WireGuardStatistics
 import com.zaneschepke.wireguardautotunnel.util.Constants
-import com.zaneschepke.wireguardautotunnel.util.extensions.requestTunnelTileServiceStateUpdate
-import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
-import org.amnezia.awg.backend.Tunnel
 import timber.log.Timber
 import javax.inject.Inject
-import javax.inject.Provider
 
 class WireGuardTunnel
 @Inject
 constructor(
-	private val amneziaBackend: Provider<org.amnezia.awg.backend.Backend>,
+    @Userspace private val userspaceBackend: Backend,
-	@Userspace private val userspaceBackend: Provider<Backend>,
+    @Kernel private val kernelBackend: Backend,
-	@Kernel private val kernelBackend: Provider<Backend>,
+    private val settingsRepository: SettingsRepository
-	private val appDataRepository: AppDataRepository,
+) : VpnService {
-	@ApplicationScope private val applicationScope: CoroutineScope,
+    private val _vpnState = MutableStateFlow(VpnState())
-	@IoDispatcher private val ioDispatcher: CoroutineDispatcher,
+    override val vpnState: StateFlow<VpnState> = _vpnState.asStateFlow()
-) : TunnelService {
-	private val _vpnState = MutableStateFlow(VpnState())
-	override val vpnState: StateFlow<VpnState> = _vpnState.asStateFlow()
 
-	override suspend fun runningTunnelNames(): Set<String> {
+    private val scope = CoroutineScope(Dispatchers.IO)
-		return when (val backend = backend()) {
-			is Backend -> backend.runningTunnelNames
-			is org.amnezia.awg.backend.Backend -> backend.runningTunnelNames
-			else -> emptySet()
-		}
-	}
 
-	private var statsJob: Job? = null
+    private lateinit var statsJob: Job
 
-	private suspend fun setState(tunnelConfig: TunnelConfig, tunnelState: TunnelState): Result<TunnelState> {
+    private var config: Config? = null
-		return runCatching {
-			when (val backend = backend()) {
-				is Backend -> backend.setState(this, tunnelState.toWgState(), TunnelConfig.configFromWgQuick(tunnelConfig.wgQuick)).let { TunnelState.from(it) }
-				is org.amnezia.awg.backend.Backend -> {
-					val config = if (tunnelConfig.amQuick.isBlank()) {
-						TunnelConfig.configFromAmQuick(
-							tunnelConfig.wgQuick,
-						)
-					} else {
-						TunnelConfig.configFromAmQuick(tunnelConfig.amQuick)
-					}
-					backend.setState(this, tunnelState.toAmState(), config).let {
-						TunnelState.from(it)
-					}
-				}
-				else -> throw NotImplementedError()
-			}
-		}.onFailure {
-			Timber.e(it)
-		}
-	}
 
-	private suspend fun backend(): Any {
+    private var backend: Backend = userspaceBackend
-		val settings = appDataRepository.settings.getSettings()
-		if (settings.isKernelEnabled) return kernelBackend.get()
-		if (settings.isAmneziaEnabled) return amneziaBackend.get()
-		return userspaceBackend.get()
-	}
 
-	override suspend fun startTunnel(tunnelConfig: TunnelConfig): Result<TunnelState> {
+    private var backendIsUserspace = true
-		return withContext(ioDispatcher) {
-			if (_vpnState.value.status == TunnelState.UP) vpnState.value.tunnelConfig?.let { stopTunnel(it) }
-			appDataRepository.tunnels.save(tunnelConfig.copy(isActive = true))
-			appDataRepository.appState.setLastActiveTunnelId(tunnelConfig.id)
-			emitTunnelConfig(tunnelConfig)
-			setState(tunnelConfig, TunnelState.UP).onSuccess {
-				emitTunnelState(it)
-				WireGuardAutoTunnel.instance.requestTunnelTileServiceStateUpdate()
-			}.onFailure {
-				appDataRepository.tunnels.save(tunnelConfig.copy(isActive = false))
-				WireGuardAutoTunnel.instance.requestTunnelTileServiceStateUpdate()
-			}
-		}
-	}
 
-	override suspend fun stopTunnel(tunnelConfig: TunnelConfig): Result<TunnelState> {
+    init {
-		return withContext(ioDispatcher) {
+        scope.launch {
-			appDataRepository.tunnels.save(tunnelConfig.copy(isActive = false))
+            settingsRepository.getSettingsFlow().collect {
-			setState(tunnelConfig, TunnelState.DOWN).onSuccess {
+                if (it.isKernelEnabled && backendIsUserspace) {
-				emitTunnelState(it)
+                    Timber.d("Setting kernel backend")
-				resetBackendStatistics()
+                    backend = kernelBackend
-				WireGuardAutoTunnel.instance.requestTunnelTileServiceStateUpdate()
+                    backendIsUserspace = false
-			}.onFailure {
+                } else if (!it.isKernelEnabled && !backendIsUserspace) {
-				Timber.e(it)
+                    Timber.d("Setting userspace backend")
-				appDataRepository.tunnels.save(tunnelConfig.copy(isActive = true))
+                    backend = userspaceBackend
-				WireGuardAutoTunnel.instance.requestTunnelTileServiceStateUpdate()
+                    backendIsUserspace = true
-			}
+                }
-		}
+            }
-	}
+        }
+    }
 
-	private fun emitTunnelState(state: TunnelState) {
+    override suspend fun startTunnel(tunnelConfig: TunnelConfig): State {
-		_vpnState.tryEmit(
+        return try {
-			_vpnState.value.copy(
+            stopTunnelOnConfigChange(tunnelConfig)
-				status = state,
+            emitTunnelName(tunnelConfig.name)
-			),
+            config = TunnelConfig.configFromQuick(tunnelConfig.wgQuick)
-		)
+            val state =
-	}
+                backend.setState(
+                    this,
+                    State.UP,
+                    config,
+                )
+            emitTunnelState(state)
+            state
+        } catch (e: Exception) {
+            Timber.e("Failed to start tunnel with error: ${e.message}")
+            State.DOWN
+        }
+    }
 
-	private fun emitBackendStatistics(statistics: TunnelStatistics) {
+    private fun emitTunnelState(state: State) {
-		_vpnState.tryEmit(
+        _vpnState.tryEmit(
-			_vpnState.value.copy(
+            _vpnState.value.copy(
-				statistics = statistics,
+                status = state,
-			),
+            ),
-		)
+        )
-	}
+    }
 
-	private fun emitTunnelConfig(tunnelConfig: TunnelConfig?) {
+    private fun emitBackendStatistics(statistics: Statistics) {
-		_vpnState.tryEmit(
+        _vpnState.tryEmit(
-			_vpnState.value.copy(
+            _vpnState.value.copy(
-				tunnelConfig = tunnelConfig,
+                statistics = statistics,
-			),
+            ),
-		)
+        )
-	}
+    }
 
-	private fun resetBackendStatistics() {
+    private suspend fun emitTunnelName(name: String) {
-		_vpnState.tryEmit(
+        _vpnState.emit(
-			_vpnState.value.copy(
+            _vpnState.value.copy(
-				statistics = null,
+                name = name,
-			),
+            ),
-		)
+        )
-	}
+    }
 
-	override suspend fun getState(): TunnelState {
+    private suspend fun stopTunnelOnConfigChange(tunnelConfig: TunnelConfig) {
-		return when (val backend = backend()) {
+        if (getState() == State.UP && _vpnState.value.name != tunnelConfig.name) {
-			is Backend -> backend.getState(this).let { TunnelState.from(it) }
+            stopTunnel()
-			is org.amnezia.awg.backend.Backend -> backend.getState(this).let { TunnelState.from(it) }
+        }
-			else -> TunnelState.DOWN
+    }
-		}
-	}
 
-	override fun cancelStatsJob() {
+    override fun getName(): String {
-		statsJob?.cancel()
+        return _vpnState.value.name
-	}
+    }
 
-	override fun startStatsJob() {
+    override suspend fun stopTunnel() {
-		statsJob = startTunnelStatisticsJob()
+        try {
-	}
+            if (getState() == State.UP) {
+                val state = backend.setState(this, State.DOWN, null)
+                emitTunnelState(state)
+            }
+        } catch (e: BackendException) {
+            Timber.e("Failed to stop tunnel with error: ${e.message}")
+        }
+    }
 
-	override fun getName(): String {
+    override fun getState(): State {
-		return _vpnState.value.tunnelConfig?.name ?: ""
+        return backend.getState(this)
-	}
+    }
 
-	override fun onStateChange(newState: Tunnel.State) {
+    override fun onStateChange(state: State) {
-		handleStateChange(TunnelState.from(newState))
+        val tunnel = this
-	}
+        emitTunnelState(state)
-
+        WireGuardAutoTunnel.requestTileServiceStateUpdate()
-	private fun handleStateChange(state: TunnelState) {
+        if (state == State.UP) {
-		emitTunnelState(state)
+            statsJob =
-		WireGuardAutoTunnel.instance.requestTunnelTileServiceStateUpdate()
+                scope.launch {
-		when (state) {
+                    while (true) {
-			TunnelState.UP -> startStatsJob()
+                        val statistics = backend.getStatistics(tunnel)
-			else -> cancelStatsJob()
+                        emitBackendStatistics(statistics)
-		}
+                        delay(Constants.VPN_STATISTIC_CHECK_INTERVAL)
-	}
+                    }
-
+                }
-	private fun startTunnelStatisticsJob() = applicationScope.launch(ioDispatcher) {
+        }
-		val backend = backend()
+        if (state == State.DOWN) {
-		while (true) {
+            if (this::statsJob.isInitialized) {
-			when (backend) {
+                statsJob.cancel()
-				is Backend -> emitBackendStatistics(
+            }
-					WireGuardStatistics(backend.getStatistics(this@WireGuardTunnel)),
+        }
-				)
+    }
-				is org.amnezia.awg.backend.Backend -> {
-					emitBackendStatistics(
-						AmneziaStatistics(
-							backend.getStatistics(this@WireGuardTunnel),
-						),
-					)
-				}
-			}
-			delay(Constants.VPN_STATISTIC_CHECK_INTERVAL)
-		}
-	}
-
-	override fun onStateChange(state: State) {
-		handleStateChange(TunnelState.from(state))
-	}
 }

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

@@ -1,34 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.service.tunnel.statistics
-
-import org.amnezia.awg.backend.Statistics
-import org.amnezia.awg.crypto.Key
-
-class AmneziaStatistics(private val statistics: Statistics) : TunnelStatistics() {
-	override fun peerStats(peer: Key): PeerStats? {
-		val key = Key.fromBase64(peer.toBase64())
-		val stats = statistics.peer(key)
-		return stats?.let {
-			PeerStats(
-				rxBytes = stats.rxBytes,
-				txBytes = stats.txBytes,
-				latestHandshakeEpochMillis = stats.latestHandshakeEpochMillis,
-			)
-		}
-	}
-
-	override fun isTunnelStale(): Boolean {
-		return statistics.isStale
-	}
-
-	override fun getPeers(): Array<Key> {
-		return statistics.peers()
-	}
-
-	override fun rx(): Long {
-		return statistics.totalRx()
-	}
-
-	override fun tx(): Long {
-		return statistics.totalTx()
-	}
-}

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

@@ -1,18 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.service.tunnel.statistics
-
-import org.amnezia.awg.crypto.Key
-
-abstract class TunnelStatistics {
-	@JvmRecord
-	data class PeerStats(val rxBytes: Long, val txBytes: Long, val latestHandshakeEpochMillis: Long)
-
-	abstract fun peerStats(peer: Key): PeerStats?
-
-	abstract fun isTunnelStale(): Boolean
-
-	abstract fun getPeers(): Array<Key>
-
-	abstract fun rx(): Long
-
-	abstract fun tx(): Long
-}

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

@@ -1,36 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.service.tunnel.statistics
-
-import com.wireguard.android.backend.Statistics
-import org.amnezia.awg.crypto.Key
-
-class WireGuardStatistics(private val statistics: Statistics) : TunnelStatistics() {
-	override fun peerStats(peer: Key): PeerStats? {
-		val key = com.wireguard.crypto.Key.fromBase64(peer.toBase64())
-		val peerStats = statistics.peer(key)
-		return peerStats?.let {
-			PeerStats(
-				txBytes = peerStats.txBytes,
-				rxBytes = peerStats.rxBytes,
-				latestHandshakeEpochMillis = peerStats.latestHandshakeEpochMillis,
-			)
-		}
-	}
-
-	override fun isTunnelStale(): Boolean {
-		return statistics.isStale
-	}
-
-	override fun getPeers(): Array<Key> {
-		return statistics.peers().map {
-			Key.fromBase64(it.toBase64())
-		}.toTypedArray()
-	}
-
-	override fun rx(): Long {
-		return statistics.totalRx()
-	}
-
-	override fun tx(): Long {
-		return statistics.totalTx()
-	}
-}

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

@@ -0,0 +1,13 @@
+package com.zaneschepke.wireguardautotunnel.ui
+
+import androidx.lifecycle.ViewModel
+import com.zaneschepke.wireguardautotunnel.data.SettingsDao
+import dagger.hilt.android.lifecycle.HiltViewModel
+import javax.inject.Inject
+
+@HiltViewModel
+class ActivityViewModel
+@Inject
+constructor(
+    private val settingsRepo: SettingsDao,
+) : ViewModel() {}

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

@@ -1,8 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.ui
-
-data class AppUiState(
-	val snackbarMessage: String = "",
-	val snackbarMessageConsumed: Boolean = true,
-	val notificationPermissionAccepted: Boolean = false,
-	val requestPermissions: Boolean = false,
-)

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

@@ -1,53 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.ui
-
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.viewModelScope
-import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
-import dagger.hilt.android.lifecycle.HiltViewModel
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.asStateFlow
-import kotlinx.coroutines.flow.update
-import kotlinx.coroutines.launch
-import xyz.teamgravity.pin_lock_compose.PinManager
-import javax.inject.Inject
-
-@HiltViewModel
-class AppViewModel
-@Inject
-constructor(
-	private val appDataRepository: AppDataRepository,
-) : ViewModel() {
-
-	private val _appUiState =
-		MutableStateFlow(
-			AppUiState(),
-		)
-	val appUiState = _appUiState.asStateFlow()
-
-	fun showSnackbarMessage(message: String) {
-		_appUiState.update {
-			it.copy(
-				snackbarMessage = message,
-				snackbarMessageConsumed = false,
-			)
-		}
-	}
-
-	fun snackbarMessageConsumed() {
-		_appUiState.update {
-			it.copy(
-				snackbarMessage = "",
-				snackbarMessageConsumed = true,
-			)
-		}
-	}
-
-	fun onPinLockDisabled() = viewModelScope.launch {
-		PinManager.clearPin()
-		appDataRepository.appState.setPinLockEnabled(false)
-	}
-
-	fun onPinLockEnabled() = viewModelScope.launch {
-		appDataRepository.appState.setPinLockEnabled(true)
-	}
-}

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

@@ -0,0 +1,5 @@
+package com.zaneschepke.wireguardautotunnel.ui
+
+import com.journeyapps.barcodescanner.CaptureActivity
+
+class CaptureActivityPortrait : CaptureActivity()

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

@@ -1,16 +1,16 @@
 package com.zaneschepke.wireguardautotunnel.ui
 
+import android.Manifest
+import android.content.Intent
+import android.net.Uri
+import android.os.Build
 import android.os.Bundle
-import androidx.activity.SystemBarStyle
+import android.provider.Settings
+import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.compose.setContent
-import androidx.activity.enableEdgeToEdge
+import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AppCompatActivity
-import androidx.compose.animation.core.tween
-import androidx.compose.animation.fadeIn
-import androidx.compose.animation.fadeOut
 import androidx.compose.foundation.focusable
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.SnackbarData
@@ -18,221 +18,234 @@ import androidx.compose.material3.SnackbarDuration
 import androidx.compose.material3.SnackbarHost
 import androidx.compose.material3.SnackbarHostState
 import androidx.compose.material3.SnackbarResult
-import androidx.compose.material3.Surface
 import androidx.compose.material3.surfaceColorAtElevation
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.focus.focusProperties
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.toArgb
 import androidx.compose.ui.unit.dp
-import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.lifecycle.ProcessLifecycleOwner
-import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.lifecycle.lifecycleScope
-import androidx.navigation.NavType
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
-import androidx.navigation.compose.currentBackStackEntryAsState
 import androidx.navigation.compose.rememberNavController
-import androidx.navigation.navArgument
+import com.google.accompanist.permissions.ExperimentalPermissionsApi
-import com.zaneschepke.wireguardautotunnel.data.repository.AppStateRepository
+import com.google.accompanist.permissions.isGranted
-import com.zaneschepke.wireguardautotunnel.service.tunnel.TunnelService
+import com.google.accompanist.permissions.rememberPermissionState
+import com.wireguard.android.backend.GoBackend
+import com.zaneschepke.wireguardautotunnel.R
+import com.zaneschepke.wireguardautotunnel.WireGuardAutoTunnel
+import com.zaneschepke.wireguardautotunnel.data.datastore.DataStoreManager
+import com.zaneschepke.wireguardautotunnel.data.repository.SettingsRepository
+import com.zaneschepke.wireguardautotunnel.ui.common.PermissionRequestFailedScreen
 import com.zaneschepke.wireguardautotunnel.ui.common.navigation.BottomNavBar
 import com.zaneschepke.wireguardautotunnel.ui.common.prompt.CustomSnackBar
 import com.zaneschepke.wireguardautotunnel.ui.screens.config.ConfigScreen
-import com.zaneschepke.wireguardautotunnel.ui.screens.main.ConfigType
 import com.zaneschepke.wireguardautotunnel.ui.screens.main.MainScreen
-import com.zaneschepke.wireguardautotunnel.ui.screens.options.OptionsScreen
-import com.zaneschepke.wireguardautotunnel.ui.screens.pinlock.PinLockScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.settings.SettingsScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.support.SupportScreen
-import com.zaneschepke.wireguardautotunnel.ui.screens.support.logs.LogsScreen
+import com.zaneschepke.wireguardautotunnel.ui.theme.TransparentSystemBars
 import com.zaneschepke.wireguardautotunnel.ui.theme.WireguardAutoTunnelTheme
 import com.zaneschepke.wireguardautotunnel.util.Constants
-import com.zaneschepke.wireguardautotunnel.util.StringValue
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
+import timber.log.Timber
+import java.io.IOException
 import javax.inject.Inject
 
 @AndroidEntryPoint
 class MainActivity : AppCompatActivity() {
-	@Inject
-	lateinit var appStateRepository: AppStateRepository
 
-	@Inject
+    @Inject
-	lateinit var tunnelService: TunnelService
+    lateinit var dataStoreManager: DataStoreManager
 
-	override fun onCreate(savedInstanceState: Bundle?) {
+    @Inject lateinit var settingsRepository: SettingsRepository
-		super.onCreate(savedInstanceState)
+    @OptIn(
+        ExperimentalPermissionsApi::class,
+    )
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
 
-		val isPinLockEnabled = intent.extras?.getBoolean(SplashActivity.IS_PIN_LOCK_ENABLED_KEY)
+        // load preferences into memory and init data
+        lifecycleScope.launch {
+            try {
+                dataStoreManager.init()
+                if (settingsRepository.getAll().isEmpty()) {
+                    settingsRepository.save(com.zaneschepke.wireguardautotunnel.data.model.Settings())
+                }
+                WireGuardAutoTunnel.requestTileServiceStateUpdate()
+            } catch (e: IOException) {
+                Timber.e("Failed to load preferences")
+            }
+        }
+        setContent {
+            //            val activityViewModel = hiltViewModel<ActivityViewModel>()
 
-		enableEdgeToEdge(navigationBarStyle = SystemBarStyle.dark(Color.Transparent.toArgb()))
+            val navController = rememberNavController()
+            val focusRequester = remember { FocusRequester() }
 
-		setContent {
+            WireguardAutoTunnelTheme {
-			val appViewModel = hiltViewModel<AppViewModel>()
+                TransparentSystemBars()
-			val appUiState by appViewModel.appUiState.collectAsStateWithLifecycle()
-			val navController = rememberNavController()
-			val navBackStackEntry by navController.currentBackStackEntryAsState()
 
-			val snackbarHostState = remember { SnackbarHostState() }
+                val snackbarHostState = remember { SnackbarHostState() }
 
-			fun showSnackBarMessage(message: StringValue) {
+                val notificationPermissionState =
-				lifecycleScope.launch(Dispatchers.Main) {
+                    rememberPermissionState(Manifest.permission.POST_NOTIFICATIONS)
-					val result =
-						snackbarHostState.showSnackbar(
-							message = message.asString(this@MainActivity),
-							duration = SnackbarDuration.Short,
-						)
-					when (result) {
-						SnackbarResult.ActionPerformed,
-						SnackbarResult.Dismissed,
-						-> {
-							snackbarHostState.currentSnackbarData?.dismiss()
-						}
-					}
-				}
-			}
 
-			WireguardAutoTunnelTheme {
+                fun requestNotificationPermission() {
-				LaunchedEffect(appUiState.snackbarMessageConsumed) {
+                    if (
-					if (!appUiState.snackbarMessageConsumed) {
+                        !notificationPermissionState.status.isGranted &&
-						showSnackBarMessage(StringValue.DynamicString(appUiState.snackbarMessage))
+                            Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU
-						appViewModel.snackbarMessageConsumed()
+                    ) {
-					}
+                        notificationPermissionState.launchPermissionRequest()
-				}
+                    }
+                }
 
-				val focusRequester = remember { FocusRequester() }
+                var vpnIntent by remember { mutableStateOf(GoBackend.VpnService.prepare(this)) }
+                val vpnActivityResultState =
+                    rememberLauncherForActivityResult(
+                        ActivityResultContracts.StartActivityForResult(),
+                        onResult = {
+                            val accepted = (it.resultCode == RESULT_OK)
+                            if (accepted) {
+                                vpnIntent = null
+                            }
+                        },
+                    )
+                LaunchedEffect(vpnIntent) {
+                    if (vpnIntent != null) {
+                        vpnActivityResultState.launch(vpnIntent)
+                    } else {
+                        requestNotificationPermission()
+                    }
+                }
 
-				Scaffold(
+                fun showSnackBarMessage(message: String) {
-					snackbarHost = {
+                    lifecycleScope.launch(Dispatchers.Main) {
-						SnackbarHost(snackbarHostState) { snackbarData: SnackbarData ->
+                        val result =
-							CustomSnackBar(
+                            snackbarHostState.showSnackbar(
-								snackbarData.visuals.message,
+                                message = message,
-								isRtl = false,
+                                actionLabel = applicationContext.getString(R.string.okay),
-								containerColor =
+                                duration = SnackbarDuration.Short,
-								MaterialTheme.colorScheme.surfaceColorAtElevation(
+                            )
-									2.dp,
+                        when (result) {
-								),
+                            SnackbarResult.ActionPerformed,
-							)
+                            SnackbarResult.Dismissed -> {
-						}
+                                snackbarHostState.currentSnackbarData?.dismiss()
-					},
+                            }
-					containerColor = MaterialTheme.colorScheme.background,
+                        }
-					modifier =
+                    }
-					Modifier
+                }
-						.focusable()
-						.focusProperties {
-							when (navBackStackEntry?.destination?.route) {
-								Screen.Lock.route -> Unit
-								else -> up = focusRequester
-							}
-						},
-					bottomBar = {
-						BottomNavBar(
-							navController,
-							listOf(
-								Screen.Main.navItem,
-								Screen.Settings.navItem,
-								Screen.Support.navItem,
-							),
-						)
-					},
-				) { padding ->
-					Surface(modifier = Modifier.fillMaxSize().padding(padding)) {
-						NavHost(
-							navController,
-							enterTransition = { fadeIn(tween(Constants.TRANSITION_ANIMATION_TIME)) },
-							exitTransition = { fadeOut(tween(Constants.TRANSITION_ANIMATION_TIME)) },
-							startDestination = (if (isPinLockEnabled == true) Screen.Lock.route else Screen.Main.route),
-						) {
-							composable(
-								Screen.Main.route,
-							) {
-								MainScreen(
-									focusRequester = focusRequester,
-									appViewModel = appViewModel,
-									navController = navController,
-								)
-							}
-							composable(
-								Screen.Settings.route,
-							) {
-								SettingsScreen(
-									appViewModel = appViewModel,
-									navController = navController,
-									focusRequester = focusRequester,
-								)
-							}
-							composable(
-								Screen.Support.route,
-							) {
-								SupportScreen(
-									focusRequester = focusRequester,
-									navController = navController,
-								)
-							}
-							composable(Screen.Support.Logs.route) {
-								LogsScreen()
-							}
-							composable(
-								"${Screen.Config.route}/{id}?configType={configType}",
-								arguments =
-								listOf(
-									navArgument("id") {
-										type = NavType.StringType
-										defaultValue = "0"
-									},
-									navArgument("configType") {
-										type = NavType.StringType
-										defaultValue = ConfigType.WIREGUARD.name
-									},
-								),
-							) {
-								val id = it.arguments?.getString("id")
-								val configType =
-									ConfigType.valueOf(
-										it.arguments?.getString("configType") ?: ConfigType.WIREGUARD.name,
-									)
-								if (!id.isNullOrBlank()) {
-									ConfigScreen(
-										navController = navController,
-										tunnelId = id,
-										appViewModel = appViewModel,
-										focusRequester = focusRequester,
-										configType = configType,
-									)
-								}
-							}
-							composable("${Screen.Option.route}/{id}") {
-								val id = it.arguments?.getString("id")
-								if (!id.isNullOrBlank()) {
-									OptionsScreen(
-										navController = navController,
-										tunnelId = id,
-										appViewModel = appViewModel,
-										focusRequester = focusRequester,
-									)
-								}
-							}
-							composable(Screen.Lock.route) {
-								PinLockScreen(
-									navController = navController,
-									appViewModel = appViewModel,
-								)
-							}
-						}
-					}
-				}
-			}
-		}
-	}
 
-	override fun onDestroy() {
+                Scaffold(
-		super.onDestroy()
+                    snackbarHost = {
-		tunnelService.cancelStatsJob()
+                        SnackbarHost(snackbarHostState) { snackbarData: SnackbarData ->
-	}
+                            CustomSnackBar(
+                                snackbarData.visuals.message,
+                                isRtl = false,
+                                containerColor =
+                                    MaterialTheme.colorScheme.surfaceColorAtElevation(
+                                        2.dp,
+                                    ),
+                            )
+                        }
+                    },
+                    modifier = Modifier.focusable().focusProperties { up = focusRequester },
+                    bottomBar =
+                        if (vpnIntent == null && notificationPermissionState.status.isGranted) {
+                            {
+                                BottomNavBar(
+                                    navController,
+                                    listOf(
+                                        Screen.Main.navItem,
+                                        Screen.Settings.navItem,
+                                        Screen.Support.navItem,
+                                    ),
+                                )
+                            }
+                        } else {
+                            {}
+                        },
+                ) { padding ->
+                    if (vpnIntent != null) {
+                        PermissionRequestFailedScreen(
+                            padding = padding,
+                            onRequestAgain = { vpnActivityResultState.launch(vpnIntent) },
+                            message = getString(R.string.vpn_permission_required),
+                            getString(R.string.retry),
+                        )
+                        return@Scaffold
+                    }
+                    if (!notificationPermissionState.status.isGranted) {
+                        PermissionRequestFailedScreen(
+                            padding = padding,
+                            onRequestAgain = {
+                                val intentSettings =
+                                    Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS)
+                                intentSettings.data =
+                                    Uri.fromParts(
+                                        Constants.URI_PACKAGE_SCHEME,
+                                        this.packageName,
+                                        null,
+                                    )
+                                startActivity(intentSettings)
+                            },
+                            message = getString(R.string.notification_permission_required),
+                            getString(R.string.open_settings),
+                        )
+                        return@Scaffold
+                    }
+                    NavHost(navController, startDestination = Screen.Main.route) {
+                        composable(
+                            Screen.Main.route,
+                        ) {
+                            MainScreen(
+                                padding = padding,
+                                focusRequester = focusRequester,
+                                showSnackbarMessage = { message -> showSnackBarMessage(message) },
+                                navController = navController,
+                            )
+                        }
+                        composable(
+                            Screen.Settings.route,
+                        ) {
+                            SettingsScreen(
+                                padding = padding,
+                                showSnackbarMessage = { message -> showSnackBarMessage(message) },
+                                focusRequester = focusRequester,
+                            )
+                        }
+                        composable(
+                            Screen.Support.route,
+                        ) {
+                            SupportScreen(
+                                padding = padding,
+                                focusRequester = focusRequester,
+                                showSnackbarMessage = { message -> showSnackBarMessage(message) },
+                            )
+                        }
+                        composable("${Screen.Config.route}/{id}") {
+                            val id = it.arguments?.getString("id")
+                            if (!id.isNullOrBlank()) {
+                                // https://dagger.dev/hilt/view-model#assisted-injection
+                                ConfigScreen(
+                                    navController = navController,
+                                    id = id,
+                                    showSnackbarMessage = { message ->
+                                        showSnackBarMessage(message)
+                                    },
+                                    focusRequester = focusRequester,
+                                )
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
 }

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

@@ -4,43 +4,35 @@ 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 com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.WireGuardAutoTunnel
 import com.zaneschepke.wireguardautotunnel.ui.common.navigation.BottomNavItem
 
 sealed class Screen(val route: String) {
-	data object Main : Screen("main") {
+    data object Main : Screen("main") {
-		val navItem =
+        val navItem =
-			BottomNavItem(
+            BottomNavItem(
-				name = WireGuardAutoTunnel.instance.getString(R.string.tunnels),
+                name = "Tunnels",
-				route = route,
+                route = route,
-				icon = Icons.Rounded.Home,
+                icon = Icons.Rounded.Home,
-			)
+            )
-	}
+    }
 
-	data object Settings : Screen("settings") {
+    data object Settings : Screen("settings") {
-		val navItem =
+        val navItem =
-			BottomNavItem(
+            BottomNavItem(
-				name = WireGuardAutoTunnel.instance.getString(R.string.settings),
+                name = "Settings",
-				route = route,
+                route = route,
-				icon = Icons.Rounded.Settings,
+                icon = Icons.Rounded.Settings,
-			)
+            )
-	}
+    }
 
-	data object Support : Screen("support") {
+    data object Support : Screen("support") {
-		val navItem =
+        val navItem =
-			BottomNavItem(
+            BottomNavItem(
-				name = WireGuardAutoTunnel.instance.getString(R.string.support),
+                name = "Support",
-				route = route,
+                route = route,
-				icon = Icons.Rounded.QuestionMark,
+                icon = Icons.Rounded.QuestionMark,
-			)
+            )
+    }
 
-		data object Logs : Screen("support/logs")
+    data object Config : Screen("config")
-	}
-
-	data object Config : Screen("config")
-
-	data object Lock : Screen("lock")
-
-	data object Option : Screen("option")
 }

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

@@ -1,75 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.ui
-
-import android.annotation.SuppressLint
-import android.content.Intent
-import android.os.Build
-import android.os.Bundle
-import androidx.activity.ComponentActivity
-import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
-import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.lifecycleScope
-import androidx.lifecycle.repeatOnLifecycle
-import com.zaneschepke.wireguardautotunnel.WireGuardAutoTunnel
-import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
-import com.zaneschepke.wireguardautotunnel.data.repository.AppStateRepository
-import com.zaneschepke.wireguardautotunnel.service.foreground.ServiceManager
-import com.zaneschepke.wireguardautotunnel.service.tunnel.TunnelService
-import com.zaneschepke.wireguardautotunnel.service.tunnel.TunnelState
-import com.zaneschepke.wireguardautotunnel.util.extensions.requestAutoTunnelTileServiceUpdate
-import com.zaneschepke.wireguardautotunnel.util.extensions.requestTunnelTileServiceStateUpdate
-import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.launch
-import xyz.teamgravity.pin_lock_compose.PinManager
-import javax.inject.Inject
-import javax.inject.Provider
-
-@SuppressLint("CustomSplashScreen")
-@AndroidEntryPoint
-class SplashActivity : ComponentActivity() {
-	@Inject
-	lateinit var appStateRepository: AppStateRepository
-
-	@Inject
-	lateinit var appDataRepository: AppDataRepository
-
-	@Inject
-	lateinit var tunnelService: Provider<TunnelService>
-
-	@Inject
-	lateinit var serviceManager: ServiceManager
-
-	override fun onCreate(savedInstanceState: Bundle?) {
-		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-			val splashScreen = installSplashScreen()
-			splashScreen.setKeepOnScreenCondition { true }
-		}
-		super.onCreate(savedInstanceState)
-
-		lifecycleScope.launch {
-			repeatOnLifecycle(Lifecycle.State.CREATED) {
-				val pinLockEnabled = appStateRepository.isPinLockEnabled()
-				if (pinLockEnabled) {
-					PinManager.initialize(WireGuardAutoTunnel.instance)
-				}
-				val settings = appDataRepository.settings.getSettings()
-				if (settings.isAutoTunnelEnabled) serviceManager.startWatcherService(application.applicationContext)
-				if (tunnelService.get().getState() == TunnelState.UP) tunnelService.get().startStatsJob()
-				val tunnels = appDataRepository.tunnels.getActive()
-				if (tunnels.isNotEmpty() && tunnelService.get().getState() == TunnelState.DOWN) tunnelService.get().startTunnel(tunnels.first())
-				requestTunnelTileServiceStateUpdate()
-				requestAutoTunnelTileServiceUpdate()
-
-				val intent =
-					Intent(this@SplashActivity, MainActivity::class.java).apply {
-						putExtra(IS_PIN_LOCK_ENABLED_KEY, pinLockEnabled)
-					}
-				startActivity(intent)
-				finish()
-			}
-		}
-	}
-
-	companion object {
-		const val IS_PIN_LOCK_ENABLED_KEY = "is_pin_lock_enabled"
-	}
-}

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

@@ -10,27 +10,32 @@ import androidx.compose.material3.TextButton
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.res.stringResource
+import com.zaneschepke.wireguardautotunnel.R
 
 @Composable
-fun ClickableIconButton(onClick: () -> Unit, onIconClick: () -> Unit, text: String, icon: ImageVector, enabled: Boolean) {
+fun ClickableIconButton(
-	TextButton(
+    onClick: () -> Unit,
-		onClick = onClick,
+    onIconClick: () -> Unit,
-		enabled = enabled,
+    text: String,
-	) {
+    icon: ImageVector,
-		Text(text, Modifier.weight(1f, false))
+    enabled: Boolean
-		Spacer(modifier = Modifier.size(ButtonDefaults.IconSpacing))
+) {
-		Icon(
+    TextButton(
-			imageVector = icon,
+        onClick = onClick,
-			contentDescription = icon.name,
+        enabled = enabled,
-			modifier =
+    ) {
-			Modifier
+        Text(text, Modifier.weight(1f, false))
-				.size(ButtonDefaults.IconSize)
+        Spacer(modifier = Modifier.size(ButtonDefaults.IconSpacing))
-				.weight(1f, false)
+        Icon(
-				.clickable {
+            imageVector = icon,
-					if (enabled) {
+            contentDescription = stringResource(R.string.delete),
-						onIconClick()
+            modifier =
-					}
+                Modifier.size(ButtonDefaults.IconSize).weight(1f, false).clickable {
-				},
+                    if (enabled) {
-		)
+                        onIconClick()
-	}
+                    }
+                },
+        )
+    }
 }