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
@@ -83,15 +83,3 @@ ij_kotlin_while_on_new_line = false
 ij_kotlin_wrap_elvis_expressions = 1
 ij_kotlin_wrap_expression_body_functions = 1
 ij_kotlin_wrap_first_method_in_call_chain = false
-#compose
-ktlint_standard_filename = disabled
-ktlint_standard_no-wildcard-imports = disabled
-ktlint_standard_function-naming = disabled
-ktlint_standard_property-naming = disabled
-ktlint_standard_package-naming = disabled
-ktlint_function_naming_ignore_when_annotated_with = Composable
-ktlint_code_style = android_studio
-ktlint_standard_import-ordering = disabled
-ktlint_standard_package-naming = disabled
-ij_kotlin_allow_trailing_comma = true
-ij_kotlin_allow_trailing_comma_on_call_site = true

.github/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,236 +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.4
-        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
-
-      - 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 }})
-

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
 * 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 restart after reboot
+* Automatic service restart after reboot
-* Automatic tunnel 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,27 +1,23 @@
+import java.util.Properties
+
 plugins {
     alias(libs.plugins.android.application)
     alias(libs.plugins.kotlin.android)
     alias(libs.plugins.hilt.android)
-	alias(libs.plugins.kotlinxSerialization)
+    id("org.jetbrains.kotlin.plugin.serialization")
     alias(libs.plugins.ksp)
-	alias(libs.plugins.compose.compiler)
-	alias(libs.plugins.grgit)
 }
 
 android {
     namespace = Constants.APP_ID
     compileSdk = Constants.TARGET_SDK
 
-	androidResources {
-		generateLocaleConfig = true
-	}
-
     defaultConfig {
         applicationId = Constants.APP_ID
         minSdk = Constants.MIN_SDK
         targetSdk = Constants.TARGET_SDK
-		versionCode = determineVersionCode()
+        versionCode = Constants.VERSION_CODE
-		versionName = determineVersionName()
+        versionName = Constants.VERSION_NAME
 
         ksp { arg("room.schemaLocation", "$projectDir/schemas") }
 
@@ -29,16 +25,52 @@ android {
             getByName("debug").assets.srcDirs(files("$projectDir/schemas")) // Room
         }
 
+        resourceConfigurations.addAll(listOf("en"))
+
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables { useSupportLibrary = true }
     }
 
     signingConfigs {
         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())
+                    }
+                }
+
+            // try to get secrets from env first for pipeline build, then properties file for local
+            // build
+            storeFile =
+                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),
+                    )
         }
     }
 
@@ -48,6 +80,16 @@ android {
             listOf("libwg-go.so", "libwg-quick.so", "libwg.so"),
         )
 
+        applicationVariants.all {
+            val variant = this
+            variant.outputs
+                .map { it as com.android.build.gradle.internal.api.BaseVariantOutputImpl }
+                .forEach { output ->
+                    val outputFileName =
+                        "${Constants.APP_NAME}-${variant.flavorName}-${variant.buildType.name}-${variant.versionName}.apk"
+                    output.outputFileName = outputFileName
+                }
+        }
         release {
             isDebuggable = false
             isMinifyEnabled = true
@@ -59,26 +101,6 @@ android {
             signingConfig = signingConfigs.getByName(Constants.RELEASE)
         }
         debug { isDebuggable = true }
-
-		create(Constants.PRERELEASE) {
-			initWith(buildTypes.getByName(Constants.RELEASE))
-		}
-
-		create(Constants.NIGHTLY) {
-			initWith(buildTypes.getByName(Constants.RELEASE))
-		}
-
-		applicationVariants.all {
-			val variant = this
-			variant.outputs
-				.map { it as com.android.build.gradle.internal.api.BaseVariantOutputImpl }
-				.forEach { output ->
-					val outputFileName =
-						"${Constants.APP_NAME}-${variant.flavorName}-" +
-							"${variant.buildType.name}-${variant.versionName}.apk"
-					output.outputFileName = outputFileName
-				}
-		}
     }
     flavorDimensions.add(Constants.TYPE)
     productFlavors {
@@ -88,6 +110,10 @@ android {
         }
         create("general") {
             dimension = Constants.TYPE
+            if (BuildHelper.isReleaseBuild(gradle) && BuildHelper.isGeneralFlavor(gradle)) {
+                apply(plugin = "com.google.gms.google-services")
+                apply(plugin = "com.google.firebase.crashlytics")
+            }
         }
     }
     compileOptions {
@@ -100,19 +126,16 @@ android {
         compose = true
         buildConfig = true
     }
+    composeOptions { kotlinCompilerExtensionVersion = Constants.COMPOSE_COMPILER_EXTENSION_VERSION }
     packaging { resources { excludes += "/META-INF/{AL2.0,LGPL2.1}" } }
 }
 
 val generalImplementation by configurations
 
 dependencies {
-
-	implementation(project(":logcatter"))
-
     implementation(libs.androidx.core.ktx)
     implementation(libs.androidx.lifecycle.runtime.ktx)
-
+    // optional - helpers for implementing LifecycleOwner in a Service
-	// helpers for implementing LifecycleOwner in a Service
     implementation(libs.androidx.lifecycle.service)
     implementation(libs.androidx.activity.compose)
     implementation(platform(libs.androidx.compose.bom))
@@ -133,9 +156,8 @@ dependencies {
     debugImplementation(libs.androidx.compose.ui.tooling)
     debugImplementation(libs.androidx.compose.manifest)
 
-	// get tunnel lib from github packages or mavenLocal
+    // wg
     implementation(libs.tunnel)
-	implementation(libs.amneziawg.android)
     coreLibraryDesugaring(libs.desugar.jdk.libs)
 
     // logging
@@ -145,13 +167,12 @@ dependencies {
     implementation(libs.androidx.navigation.compose)
     implementation(libs.androidx.hilt.navigation.compose)
 
-	implementation(libs.zaneschepke.multifab)
-
     // hilt
     implementation(libs.hilt.android)
     ksp(libs.hilt.android.compiler)
 
     // accompanist
+    implementation(libs.accompanist.systemuicontroller)
     implementation(libs.accompanist.permissions)
     implementation(libs.accompanist.flowlayout)
     implementation(libs.accompanist.drawablepainter)
@@ -172,38 +193,19 @@ dependencies {
     // serialization
     implementation(libs.kotlinx.serialization.json)
 
+    // firebase crashlytics
+    generalImplementation(platform(libs.firebase.bom))
+    generalImplementation(libs.google.firebase.crashlytics.ktx)
+    generalImplementation(libs.google.firebase.analytics.ktx)
+
     // barcode scanning
     implementation(libs.zxing.android.embedded)
+    implementation(libs.zxing.core)
 
     // 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/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

@@ -22,3 +22,5 @@
 -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/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
@@ -23,13 +22,39 @@ class MigrationTest {
 
     @Test
     @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.
             // You can't use DAO classes because they expect the latest schema.
-			execSQL(Queries.createDefaultSettings())
             execSQL(
-				Queries.createTunnelConfig(),
+                "INSERT INTO Settings (is_tunnel_enabled," +
+                    "is_tunnel_on_mobile_data_enabled," +
+                    "trusted_network_ssids," +
+                    "default_tunnel," +
+                    "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()
@@ -37,7 +62,7 @@ class MigrationTest {
 
         // Re-open the database with version 2 and provide
         // MIGRATION_1_2 as the migration process.
-		helper.runMigrationsAndValidate(dbName, 7, true)
+        helper.runMigrationsAndValidate(dbName, 5, true)
         // MigrationTestHelper automatically verifies the schema changes,
         // 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" />
@@ -51,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"
@@ -60,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
@@ -78,53 +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: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"
-                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.tile.AutoTunnelControlTile"
-            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"
@@ -141,7 +119,7 @@
             android:name=".service.foreground.WireGuardTunnelService"
             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">
@@ -156,7 +134,7 @@
             android:name=".service.foreground.WireGuardConnectivityWatcherService"
             android:enabled="true"
             android:exported="false"
-            android:foregroundServiceType="systemExempted"
+            android:foregroundServiceType="systemExempted|specialUse"
             android:persistent="true"
             android:stopWithTask="false"
             tools:node="merge" />

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

@@ -3,12 +3,8 @@ package com.zaneschepke.wireguardautotunnel
 import android.app.Application
 import android.content.ComponentName
 import android.content.pm.PackageManager
-import android.os.StrictMode
-import android.os.StrictMode.ThreadPolicy
 import android.service.quicksettings.TileService
-import com.zaneschepke.wireguardautotunnel.service.tile.AutoTunnelControlTile
 import com.zaneschepke.wireguardautotunnel.service.tile.TunnelControlTile
-import com.zaneschepke.wireguardautotunnel.util.ReleaseTree
 import dagger.hilt.android.HiltAndroidApp
 import timber.log.Timber
 
@@ -17,19 +13,7 @@ class WireGuardAutoTunnel : Application() {
     override fun onCreate() {
         super.onCreate()
         instance = this
-		if (BuildConfig.DEBUG) {
+        if (BuildConfig.DEBUG) Timber.plant(Timber.DebugTree())
-			Timber.plant(Timber.DebugTree())
-			StrictMode.setThreadPolicy(
-				ThreadPolicy.Builder()
-					.detectDiskReads()
-					.detectDiskWrites()
-					.detectNetwork()
-					.penaltyLog()
-					.build(),
-			)
-		} else {
-			Timber.plant(ReleaseTree())
-		}
     }
 
     companion object {
@@ -40,18 +24,11 @@ class WireGuardAutoTunnel : Application() {
             return instance.packageManager.hasSystemFeature(PackageManager.FEATURE_LEANBACK)
         }
 
-		fun requestTunnelTileServiceStateUpdate() {
+        fun requestTileServiceStateUpdate() {
             TileService.requestListeningState(
                 instance,
                 ComponentName(instance, TunnelControlTile::class.java),
             )
         }
-
-		fun requestAutoTunnelTileServiceUpdate() {
-			TileService.requestListeningState(
-				instance,
-				ComponentName(instance, AutoTunnelControlTile::class.java),
-			)
-		}
     }
 }

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

@@ -2,16 +2,14 @@ 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],
-	version = 8,
+    version = 5,
     autoMigrations =
         [
             AutoMigration(from = 1, to = 2),
@@ -24,16 +22,6 @@ import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
                 from = 4,
                 to = 5,
             ),
-		AutoMigration(
-			from = 5,
-			to = 6,
-		),
-		AutoMigration(
-			from = 6,
-			to = 7,
-			spec = RemoveLegacySettingColumnsMigration::class,
-		),
-		AutoMigration(7, 8),
         ],
     exportSchema = true,
 )
@@ -43,13 +31,3 @@ abstract class AppDatabase : RoomDatabase() {
 
     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

@@ -12,7 +12,7 @@ class DatabaseListConverters {
 
     @TypeConverter
     fun stringToList(value: String): MutableList<String> {
-		if (value.isBlank() || value.isEmpty()) return mutableListOf()
+        if (value.isEmpty()) return mutableListOf()
         return try {
             Json.decodeFromString<MutableList<String>>(value)
         } catch (e: Exception) {

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,48 +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.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")
+    @Delete suspend fun delete(t: TunnelConfig)
-	suspend fun getAll(): TunnelConfigs
 
-	@Delete
+    @Query("SELECT COUNT('id') FROM TunnelConfig") suspend fun count(): Long
-	suspend fun delete(t: TunnelConfig)
 
-	@Query("SELECT COUNT('id') FROM TunnelConfig")
+    @Query("SELECT * FROM tunnelconfig") fun getAllFlow(): Flow<MutableList<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,31 +4,15 @@ 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,
-	@IoDispatcher private val ioDispatcher: CoroutineDispatcher,
-) {
     companion object {
         val LOCATION_DISCLOSURE_SHOWN = booleanPreferencesKey("LOCATION_DISCLOSURE_SHOWN")
         val BATTERY_OPTIMIZE_DISABLE_SHOWN = booleanPreferencesKey("BATTERY_OPTIMIZE_DISABLE_SHOWN")
-		val TUNNEL_RUNNING_FROM_MANUAL_START =
-			booleanPreferencesKey("TUNNEL_RUNNING_FROM_MANUAL_START")
-		val ACTIVE_TUNNEL = intPreferencesKey("ACTIVE_TUNNEL")
-		val CURRENT_SSID = stringPreferencesKey("CURRENT_SSID")
-		val IS_PIN_LOCK_ENABLED = booleanPreferencesKey("PIN_LOCK_ENABLED")
     }
 
     // preferences
@@ -39,43 +23,16 @@ class DataStoreManager(
         )
 
     suspend fun init() {
-		withContext(ioDispatcher) {
-			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) {
-			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] }
 
-	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 {
-		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,16 +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 isTunnelRunningFromManualStart: Boolean = TUNNELING_RUNNING_FROM_MANUAL_START_DEFAULT,
-	val isPinLockEnabled: Boolean = PIN_LOCK_ENABLED_DEFAULT,
-	val activeTunnelId: Int? = null,
-) {
-	companion object {
-		const val LOCATION_DISCLOSURE_SHOWN_DEFAULT = false
-		const val BATTERY_OPTIMIZATION_DISABLE_SHOWN_DEFAULT = false
-		const val TUNNELING_RUNNING_FROM_MANUAL_START_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,53 +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,
-) {
-	companion object {
-		fun configFromWgQuick(wgQuick: String): Config {
-			val inputStream: InputStream = wgQuick.byteInputStream()
-			return inputStream.bufferedReader(Charsets.UTF_8).use {
-				Config.parse(it)
-			}
-		}
-
-		fun configFromAmQuick(amQuick: String): org.amnezia.awg.config.Config {
-			val inputStream: InputStream = amQuick.byteInputStream()
-			return inputStream.bufferedReader(Charsets.UTF_8).use {
-				org.amnezia.awg.config.Config.parse(it)
-			}
-		}
-
-		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,15 +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?
-
-	suspend fun toggleWatcherServicePause()
-
-	val settings: SettingsRepository
-	val tunnels: TunnelConfigRepository
-	val appState: AppStateRepository
-}

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

@@ -1,38 +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 if (appState.isTunnelRunningFromManualStart()) {
-			appState.getActiveTunnelId()?.let {
-				tunnels.getById(it)
-			}
-		} else {
-			null
-		}
-	}
-
-	override suspend fun toggleWatcherServicePause() {
-		val settings = settings.getSettings()
-		if (settings.isAutoTunnelEnabled) {
-			val pauseAutoTunnel = !settings.isAutoTunnelPaused
-			this.settings.save(
-				settings.copy(
-					isAutoTunnelPaused = pauseAutoTunnel,
-				),
-			)
-		}
-	}
-}

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

@@ -1,32 +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 isTunnelRunningFromManualStart(): Boolean
-
-	suspend fun setTunnelRunningFromManualStart(id: Int)
-
-	suspend fun setManualStop()
-
-	suspend fun getActiveTunnelId(): 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,96 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.data.repository
-
-import com.zaneschepke.wireguardautotunnel.data.datastore.DataStoreManager
-import com.zaneschepke.wireguardautotunnel.data.domain.GeneralState
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.map
-import timber.log.Timber
-
-class DataStoreAppStateRepository(private val dataStoreManager: DataStoreManager) :
-	AppStateRepository {
-	override suspend fun isLocationDisclosureShown(): Boolean {
-		return dataStoreManager.getFromStore(DataStoreManager.LOCATION_DISCLOSURE_SHOWN)
-			?: GeneralState.LOCATION_DISCLOSURE_SHOWN_DEFAULT
-	}
-
-	override suspend fun setLocationDisclosureShown(shown: Boolean) {
-		dataStoreManager.saveToDataStore(DataStoreManager.LOCATION_DISCLOSURE_SHOWN, shown)
-	}
-
-	override suspend fun isPinLockEnabled(): Boolean {
-		return dataStoreManager.getFromStore(DataStoreManager.IS_PIN_LOCK_ENABLED)
-			?: GeneralState.PIN_LOCK_ENABLED_DEFAULT
-	}
-
-	override suspend fun setPinLockEnabled(enabled: Boolean) {
-		dataStoreManager.saveToDataStore(DataStoreManager.IS_PIN_LOCK_ENABLED, enabled)
-	}
-
-	override suspend fun isBatteryOptimizationDisableShown(): Boolean {
-		return dataStoreManager.getFromStore(DataStoreManager.BATTERY_OPTIMIZE_DISABLE_SHOWN)
-			?: GeneralState.BATTERY_OPTIMIZATION_DISABLE_SHOWN_DEFAULT
-	}
-
-	override suspend fun setBatteryOptimizationDisableShown(shown: Boolean) {
-		dataStoreManager.saveToDataStore(DataStoreManager.BATTERY_OPTIMIZE_DISABLE_SHOWN, shown)
-	}
-
-	override suspend fun isTunnelRunningFromManualStart(): Boolean {
-		return dataStoreManager.getFromStore(DataStoreManager.TUNNEL_RUNNING_FROM_MANUAL_START)
-			?: GeneralState.TUNNELING_RUNNING_FROM_MANUAL_START_DEFAULT
-	}
-
-	override suspend fun setTunnelRunningFromManualStart(id: Int) {
-		setTunnelRunningFromManualStart(true)
-		setActiveTunnelId(id)
-	}
-
-	override suspend fun setManualStop() {
-		setTunnelRunningFromManualStart(false)
-	}
-
-	private suspend fun setTunnelRunningFromManualStart(running: Boolean) {
-		dataStoreManager.saveToDataStore(DataStoreManager.TUNNEL_RUNNING_FROM_MANUAL_START, running)
-	}
-
-	override suspend fun getActiveTunnelId(): Int? {
-		return dataStoreManager.getFromStore(DataStoreManager.ACTIVE_TUNNEL)
-	}
-
-	private suspend fun setActiveTunnelId(id: Int) {
-		dataStoreManager.saveToDataStore(DataStoreManager.ACTIVE_TUNNEL, id)
-	}
-
-	override suspend fun getCurrentSsid(): String? {
-		return dataStoreManager.getFromStore(DataStoreManager.CURRENT_SSID)
-	}
-
-	override suspend fun setCurrentSsid(ssid: String) {
-		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,
-						isTunnelRunningFromManualStart =
-						pref[DataStoreManager.TUNNEL_RUNNING_FROM_MANUAL_START]
-							?: GeneralState.TUNNELING_RUNNING_FROM_MANUAL_START_DEFAULT,
-						isPinLockEnabled =
-						pref[DataStoreManager.IS_PIN_LOCK_ENABLED]
-							?: GeneralState.TUNNELING_RUNNING_FROM_MANUAL_START_DEFAULT,
-					)
-				} catch (e: IllegalArgumentException) {
-					Timber.e(e)
-					GeneralState()
-				}
-			} ?: GeneralState()
-		}
-}

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

@@ -1,23 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.data.repository
-
-import com.zaneschepke.wireguardautotunnel.data.SettingsDao
-import com.zaneschepke.wireguardautotunnel.data.domain.Settings
-import kotlinx.coroutines.flow.Flow
-
-class RoomSettingsRepository(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/RoomTunnelConfigRepository.kt

@@ -1,71 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.data.repository
-
-import com.zaneschepke.wireguardautotunnel.data.TunnelConfigDao
-import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
-import com.zaneschepke.wireguardautotunnel.util.TunnelConfigs
-import kotlinx.coroutines.flow.Flow
-
-class RoomTunnelConfigRepository(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 updatePrimaryTunnel(tunnelConfig: TunnelConfig?) {
-		tunnelConfigDao.resetPrimaryTunnel()
-		tunnelConfig?.let {
-			save(
-				it.copy(
-					isPrimaryTunnel = true,
-				),
-			)
-		}
-	}
-
-	override suspend fun updateMobileDataTunnel(tunnelConfig: TunnelConfig?) {
-		tunnelConfigDao.resetMobileDataTunnel()
-		tunnelConfig?.let {
-			save(
-				it.copy(
-					isMobileDataTunnel = true,
-				),
-			)
-		}
-	}
-
-	override suspend fun delete(tunnelConfig: TunnelConfig) {
-		tunnelConfigDao.delete(tunnelConfig)
-	}
-
-	override suspend fun getById(id: Int): TunnelConfig? {
-		return tunnelConfigDao.getById(id.toLong())
-	}
-
-	override suspend fun count(): Int {
-		return tunnelConfigDao.count().toInt()
-	}
-
-	override suspend fun findByTunnelName(name: String): TunnelConfig? {
-		return tunnelConfigDao.getByName(name)
-	}
-
-	override suspend fun findByTunnelNetworksName(name: String): TunnelConfigs {
-		return tunnelConfigDao.findByTunnelNetworkName(name)
-	}
-
-	override suspend fun findByMobileDataTunnel(): TunnelConfigs {
-		return tunnelConfigDao.findByMobileDataTunnel()
-	}
-
-	override suspend fun findPrimary(): TunnelConfigs {
-		return tunnelConfigDao.findByPrimary()
-	}
-}

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

@@ -1,6 +1,6 @@
 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 {

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,31 +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.TunnelConfigs
 import kotlinx.coroutines.flow.Flow
 
 interface TunnelConfigRepository {
+
     fun getTunnelConfigsFlow(): Flow<TunnelConfigs>
 
     suspend fun getAll(): TunnelConfigs
 
     suspend fun save(tunnelConfig: TunnelConfig)
 
-	suspend fun updatePrimaryTunnel(tunnelConfig: TunnelConfig?)
-
-	suspend fun updateMobileDataTunnel(tunnelConfig: TunnelConfig?)
-
     suspend fun delete(tunnelConfig: TunnelConfig)
 
-	suspend fun getById(id: Int): TunnelConfig?
-
     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,45 +1,24 @@
 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
-	fun provideDatabase(@ApplicationContext context: Context): AppDatabase {
-		return Room.databaseBuilder(
-			context,
-			AppDatabase::class.java,
-			context.getString(R.string.db_name),
-		)
-			.fallbackToDestructiveMigration()
-			.addCallback(DatabaseCallback())
-			.build()
-	}
-
     @Singleton
     @Provides
     fun provideSettingsDoa(appDatabase: AppDatabase): SettingsDao {
@@ -55,34 +34,18 @@ class RepositoryModule {
     @Singleton
     @Provides
     fun provideTunnelConfigRepository(tunnelConfigDao: TunnelConfigDao): TunnelConfigRepository {
-		return RoomTunnelConfigRepository(tunnelConfigDao)
+        return TunnelConfigRepositoryImpl(tunnelConfigDao)
     }
 
     @Singleton
     @Provides
     fun provideSettingsRepository(settingsDao: SettingsDao): SettingsRepository {
-		return RoomSettingsRepository(settingsDao)
+        return SettingsRepositoryImpl(settingsDao)
     }
 
     @Singleton
     @Provides
-	fun providePreferencesDataStore(@ApplicationContext context: Context, @IoDispatcher ioDispatcher: CoroutineDispatcher): DataStoreManager {
+    fun providePreferencesDataStore(@ApplicationContext context: Context): DataStoreManager {
-		return DataStoreManager(context, ioDispatcher)
+        return DataStoreManager(context)
-	}
-
-	@Provides
-	@Singleton
-	fun provideGeneralStateRepository(dataStoreManager: DataStoreManager): AppStateRepository {
-		return DataStoreAppStateRepository(dataStoreManager)
-	}
-
-	@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

@@ -17,7 +17,9 @@ import dagger.hilt.android.scopes.ServiceScoped
 abstract class ServiceModule {
     @Binds
     @ServiceScoped
-	abstract fun provideNotificationService(wireGuardNotification: WireGuardNotification): NotificationService
+    abstract fun provideNotificationService(
+        wireGuardNotification: WireGuardNotification
+    ): NotificationService
 
     @Binds
     @ServiceScoped
@@ -25,9 +27,13 @@ abstract class ServiceModule {
 
     @Binds
     @ServiceScoped
-	abstract fun provideMobileDataService(mobileDataService: MobileDataService): NetworkService<MobileDataService>
+    abstract fun provideMobileDataService(
+        mobileDataService: MobileDataService
+    ): NetworkService<MobileDataService>
 
     @Binds
     @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

@@ -6,8 +6,7 @@ import com.wireguard.android.backend.GoBackend
 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.WireGuardTunnel
 import dagger.Module
@@ -15,9 +14,6 @@ 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
@@ -43,35 +39,13 @@ class TunnelModule {
         return WgQuickBackend(context, rootShell, ToolsInstaller(context, rootShell))
     }
 
-	@Provides
-	@Singleton
-	fun provideAmneziaBackend(@ApplicationContext context: Context): org.amnezia.awg.backend.Backend {
-		return org.amnezia.awg.backend.GoBackend(context)
-	}
-
     @Provides
     @Singleton
     fun provideVpnService(
-		amneziaBackend: Provider<org.amnezia.awg.backend.Backend>,
+        @Userspace userspaceBackend: Backend,
-		@Userspace userspaceBackend: Provider<Backend>,
+        @Kernel kernelBackend: Backend,
-		@Kernel kernelBackend: Provider<Backend>,
+        settingsRepository: SettingsRepository
-		appDataRepository: AppDataRepository,
-		@ApplicationScope applicationScope: CoroutineScope,
-		@IoDispatcher ioDispatcher: CoroutineDispatcher,
     ): VpnService {
-		return WireGuardTunnel(
+        return WireGuardTunnel(userspaceBackend, kernelBackend, settingsRepository)
-			amneziaBackend,
-			userspaceBackend,
-			kernelBackend,
-			appDataRepository,
-			applicationScope,
-			ioDispatcher,
-		)
-	}
-
-	@Provides
-	@Singleton
-	fun provideServiceManager(appDataRepository: AppDataRepository, @IoDispatcher ioDispatcher: CoroutineDispatcher): ServiceManager {
-		return ServiceManager(appDataRepository, ioDispatcher)
     }
 }

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/BootReceiver.kt

@@ -3,53 +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.util.goAsync
 import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.launch
-import timber.log.Timber
 import javax.inject.Inject
 
 @AndroidEntryPoint
 class BootReceiver : BroadcastReceiver() {
-	@Inject
-	lateinit var appDataRepository: AppDataRepository
 
-	@Inject
+    @Inject lateinit var settingsRepository: SettingsRepository
-	lateinit var serviceManager: ServiceManager
 
-	@Inject
+    override fun onReceive(context: Context?, intent: Intent?) = goAsync {
-	@ApplicationScope
+        if (Intent.ACTION_BOOT_COMPLETED != intent?.action) return@goAsync
-	lateinit var applicationScope: CoroutineScope
+        if (settingsRepository.getSettings().isAutoTunnelEnabled) {
-
+            ServiceManager.startWatcherServiceForeground(context!!)
-	override fun onReceive(context: Context?, intent: Intent?) {
-		if (Intent.ACTION_BOOT_COMPLETED != intent?.action) return
-		context?.run {
-			applicationScope.launch {
-				val settings = appDataRepository.settings.getSettings()
-				if (settings.isRestoreOnBootEnabled) {
-					if (settings.isAutoTunnelEnabled) {
-						Timber.i("Starting watcher service from boot")
-						serviceManager.startWatcherServiceForeground(context)
-					}
-					if (appDataRepository.appState.isTunnelRunningFromManualStart()) {
-						appDataRepository.appState.getActiveTunnelId()?.let {
-							Timber.i("Starting tunnel that was active before reboot")
-							serviceManager.startVpnServiceForeground(
-								context,
-								appDataRepository.tunnels.getById(it)?.id,
-							)
-							return@launch
-						}
-					}
-					if (settings.isAlwaysOnVpnEnabled) {
-						Timber.i("Starting vpn service from boot AOVPN")
-						serviceManager.startVpnServiceForeground(context)
-					}
-				}
-			}
         }
     }
 }

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

@@ -4,41 +4,28 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import com.zaneschepke.wireguardautotunnel.data.repository.SettingsRepository
-import com.zaneschepke.wireguardautotunnel.module.ApplicationScope
 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.CoroutineScope
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.delay
-import kotlinx.coroutines.launch
-import timber.log.Timber
 import javax.inject.Inject
 
 @AndroidEntryPoint
 class NotificationActionReceiver : BroadcastReceiver() {
-	@Inject
+    @Inject lateinit var settingsRepository: SettingsRepository
-	lateinit var settingsRepository: SettingsRepository
 
-	@Inject
+    override fun onReceive(context: Context, intent: Intent?) = goAsync {
-	lateinit var serviceManager: ServiceManager
-
-	@Inject
-	@ApplicationScope
-	lateinit var applicationScope: CoroutineScope
-
-	override fun onReceive(context: Context, intent: Intent?) {
-		applicationScope.launch {
         try {
-				// TODO fix for manual start changes when enabled
+            val settings = settingsRepository.getSettings()
-				serviceManager.stopVpnServiceForeground(context)
+            if (settings.defaultTunnel != null) {
+                ServiceManager.stopVpnService(context)
                 delay(Constants.TOGGLE_TUNNEL_DELAY)
-				serviceManager.startVpnServiceForeground(context)
+                ServiceManager.startVpnServiceForeground(context, settings.defaultTunnel.toString())
-			} catch (e: Exception) {
+            }
-				Timber.e(e)
         } finally {
             cancel()
         }
     }
 }
-}

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

@@ -3,6 +3,5 @@ package com.zaneschepke.wireguardautotunnel.service.foreground
 enum class Action {
     START,
     START_FOREGROUND,
-	STOP,
+    STOP
-	STOP_FOREGROUND,
 }

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

@@ -4,7 +4,6 @@ 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() {
@@ -23,15 +22,12 @@ open class ForegroundService : LifecycleService() {
             val action = intent.action
             when (action) {
                 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" -> {
-				Action.STOP.name, Action.STOP_FOREGROUND.name -> stopService()
+                    Timber.d("Always-on VPN starting service")
-				Constants.ALWAYS_ON_VPN_ACTION -> {
-					Timber.i("Always-on VPN starting service")
                     startService(intent.extras)
                 }
-
                 else -> Timber.d("This should never happen. No action in the received intent")
             }
         } else {
@@ -39,19 +35,29 @@ open class ForegroundService : LifecycleService() {
                 "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
     }
 
+    override fun onDestroy() {
+        super.onDestroy()
+        Timber.d("The service has been destroyed")
+    }
+
     protected open fun startService(extras: Bundle?) {
         if (isServiceStarted) return
         Timber.d("Starting ${this.javaClass.simpleName}")
         isServiceStarted = true
     }
 
-	protected open fun stopService() {
+    protected open fun stopService(extras: Bundle?) {
         Timber.d("Stopping ${this.javaClass.simpleName}")
+        try {
             stopForeground(STOP_FOREGROUND_REMOVE)
             stopSelf()
+        } catch (e: Exception) {
+            Timber.d("Service stopped without being started: ${e.message}")
+        }
         isServiceStarted = false
     }
 }

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

@@ -3,18 +3,32 @@ package com.zaneschepke.wireguardautotunnel.service.foreground
 import android.app.Service
 import android.content.Context
 import android.content.Intent
-import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
+import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.module.IoDispatcher
-import com.zaneschepke.wireguardautotunnel.util.Constants
-import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.withContext
 import timber.log.Timber
 
-class ServiceManager(
+object ServiceManager {
-	private val appDataRepository: AppDataRepository,
+
-	@IoDispatcher private val ioDispatcher: CoroutineDispatcher,
+    //    private
+    //    fun <T> Context.isServiceRunning(service: Class<T>) =
+    //        (getSystemService(ACTIVITY_SERVICE) as ActivityManager)
+    //            .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
+    //    }
+
+    private fun <T : Service> actionOnService(
+        action: Action,
+        context: Context,
+        cls: Class<T>,
+        extras: Map<String, String>? = null
     ) {
-	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
@@ -23,75 +37,49 @@ class ServiceManager(
         intent.component?.javaClass
         try {
             when (action) {
-				Action.START_FOREGROUND, Action.STOP_FOREGROUND ->
+                Action.START_FOREGROUND -> {
-					context.startForegroundService(
+                    context.startForegroundService(intent)
-						intent,
+                }
-					)
+                Action.START -> {
-
+                    context.startService(intent)
-				Action.START, Action.STOP -> context.startService(intent)
+                }
+                Action.STOP -> context.startService(intent)
             }
         } catch (e: Exception) {
             Timber.e(e.message)
         }
     }
 
-	suspend fun startVpnService(context: Context, tunnelId: Int? = null, isManualStart: Boolean = false) {
+    fun startVpnService(context: Context, tunnelConfig: String) {
-		if (isManualStart) onManualStart(tunnelId)
         actionOnService(
             Action.START,
             context,
             WireGuardTunnelService::class.java,
-			tunnelId?.let { mapOf(Constants.TUNNEL_EXTRA_KEY to it) },
+            mapOf(context.getString(R.string.tunnel_extras_key) to tunnelConfig),
         )
     }
 
-	suspend fun stopVpnServiceForeground(context: Context, isManualStop: Boolean = false) {
+    fun stopVpnService(context: Context) {
-		withContext(ioDispatcher) {
+        Timber.d("Stopping vpn service action")
-			if (isManualStop) onManualStop()
-			Timber.i("Stopping vpn service")
-			actionOnService(
-				Action.STOP_FOREGROUND,
-				context,
-				WireGuardTunnelService::class.java,
-			)
-		}
-	}
-
-	suspend fun stopVpnService(context: Context, isManualStop: Boolean = false) {
-		withContext(ioDispatcher) {
-			if (isManualStop) onManualStop()
-			Timber.i("Stopping vpn service")
         actionOnService(
             Action.STOP,
             context,
             WireGuardTunnelService::class.java,
         )
     }
-	}
 
-	private suspend fun onManualStop() {
+    fun startVpnServiceForeground(context: Context, tunnelConfig: String) {
-		appDataRepository.appState.setManualStop()
-	}
-
-	private suspend fun onManualStart(tunnelId: Int?) {
-		tunnelId?.let {
-			appDataRepository.appState.setTunnelRunningFromManualStart(it)
-		}
-	}
-
-	suspend fun startVpnServiceForeground(context: Context, tunnelId: Int? = null, isManualStart: Boolean = false) {
-		withContext(ioDispatcher) {
-			if (isManualStart) onManualStart(tunnelId)
         actionOnService(
             Action.START_FOREGROUND,
             context,
             WireGuardTunnelService::class.java,
-				tunnelId?.let { mapOf(Constants.TUNNEL_EXTRA_KEY to it) },
+            mapOf(context.getString(R.string.tunnel_extras_key) to tunnelConfig),
         )
     }
-	}
 
-	fun startWatcherServiceForeground(context: Context) {
+    fun startWatcherServiceForeground(
+        context: Context,
+    ) {
         actionOnService(
             Action.START_FOREGROUND,
             context,

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/WatcherState.kt

@@ -1,73 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.service.foreground
-
-import com.zaneschepke.wireguardautotunnel.data.domain.Settings
-
-data class WatcherState(
-	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/WireGuardConnectivityWatcherService.kt

@@ -1,87 +1,76 @@
 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.domain.TunnelConfig
+import com.zaneschepke.wireguardautotunnel.data.model.Settings
-import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
+import com.zaneschepke.wireguardautotunnel.data.repository.SettingsRepository
-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.TunnelState
 import com.zaneschepke.wireguardautotunnel.service.tunnel.VpnService
 import com.zaneschepke.wireguardautotunnel.util.Constants
 import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.CancellationException
+import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.collectLatest
-import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import timber.log.Timber
-import java.net.InetAddress
 import javax.inject.Inject
 
 @AndroidEntryPoint
 class WireGuardConnectivityWatcherService : ForegroundService() {
     private val foregroundId = 122
 
-	@Inject
+    @Inject lateinit var wifiService: NetworkService<WifiService>
-	lateinit var wifiService: NetworkService<WifiService>
 
-	@Inject
+    @Inject lateinit var mobileDataService: NetworkService<MobileDataService>
-	lateinit var mobileDataService: NetworkService<MobileDataService>
 
-	@Inject
+    @Inject lateinit var ethernetService: NetworkService<EthernetService>
-	lateinit var ethernetService: NetworkService<EthernetService>
 
-	@Inject
+    @Inject lateinit var settingsRepository: SettingsRepository
-	lateinit var appDataRepository: AppDataRepository
 
-	@Inject
+    @Inject lateinit var notificationService: NotificationService
-	lateinit var notificationService: NotificationService
 
-	@Inject
+    @Inject lateinit var vpnService: VpnService
-	lateinit var vpnService: VpnService
-
-	@Inject
-	lateinit var serviceManager: ServiceManager
-
-	@Inject
-	@IoDispatcher
-	lateinit var ioDispatcher: CoroutineDispatcher
-
-	@Inject
-	@MainImmediateDispatcher
-	lateinit var mainImmediateDispatcher: CoroutineDispatcher
 
     private val networkEventsFlow = MutableStateFlow(WatcherState())
 
-	private var watcherJob: Job? = null
+    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(mainImmediateDispatcher) {
+        lifecycleScope.launch(Dispatchers.Main) {
             try {
-				if (appDataRepository.settings.getSettings().isAutoTunnelPaused) {
+                if (settingsRepository.getSettings().isAutoTunnelPaused) {
                     launchWatcherPausedNotification()
-				} else {
+                } else launchWatcherNotification()
-					launchWatcherNotification()
-				}
             } catch (e: Exception) {
                 Timber.e("Failed to start watcher service, not enough permissions")
             }
@@ -100,8 +89,8 @@ class WireGuardConnectivityWatcherService : ForegroundService() {
         }
     }
 
-	override fun stopService() {
+    override fun stopService(extras: Bundle?) {
-		super.stopService()
+        super.stopService(extras)
         wakeLock?.let {
             if (it.isHeld) {
                 it.release()
@@ -111,7 +100,9 @@ class WireGuardConnectivityWatcherService : ForegroundService() {
         stopSelf()
     }
 
-	private fun launchWatcherNotification(description: String = getString(R.string.watcher_notification_text_active)) {
+    private fun launchWatcherNotification(
+        description: String = getString(R.string.watcher_notification_text_active)
+    ) {
         val notification =
             notificationService.createNotification(
                 channelId = getString(R.string.watcher_channel_id),
@@ -131,341 +122,270 @@ class WireGuardConnectivityWatcherService : ForegroundService() {
         launchWatcherNotification(getString(R.string.watcher_notification_text_paused))
     }
 
-	private fun initWakeLock() {
+    // 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 {
-					try {
+                    if (isBatterySaverOn) {
-						Timber.i("Initiating wakelock with 10 min timeout")
+                        Timber.d("Initiating wakelock with timeout")
                         acquire(Constants.BATTERY_SAVER_WATCHER_WAKE_LOCK_TIMEOUT)
-					} finally {
+                    } else {
-						release()
+                        Timber.d("Initiating wakelock with zero timeout")
+                        acquire(Constants.DEFAULT_WATCHER_WAKE_LOCK_TIMEOUT)
                     }
                 }
             }
     }
 
     private fun cancelWatcherJob() {
-		try {
+        if (this::watcherJob.isInitialized) {
-			watcherJob?.cancel()
+            watcherJob.cancel()
-		} catch (e: CancellationException) {
-			Timber.i("Watcher job cancelled")
         }
     }
 
     private fun startWatcherJob() {
         watcherJob =
-			lifecycleScope.launch {
+            lifecycleScope.launch(Dispatchers.IO) {
-				val setting = appDataRepository.settings.getSettings()
+                val setting = settingsRepository.getSettings()
                 launch {
-					Timber.i("Starting wifi watcher")
+                    Timber.d("Starting wifi watcher")
                     watchForWifiConnectivityChanges()
                 }
                 if (setting.isTunnelOnMobileDataEnabled) {
                     launch {
-						Timber.i("Starting mobile data watcher")
+                        Timber.d("Starting mobile data watcher")
                         watchForMobileDataConnectivityChanges()
                     }
                 }
                 if (setting.isTunnelOnEthernetEnabled) {
                     launch {
-						Timber.i("Starting ethernet data watcher")
+                        Timber.d("Starting ethernet data watcher")
                         watchForEthernetConnectivityChanges()
                     }
                 }
                 launch {
-					Timber.i("Starting settings watcher")
+                    Timber.d("Starting vpn state watcher")
+                    watchForVpnConnectivityChanges()
+                }
+                launch {
+                    Timber.d("Starting settings watcher")
                     watchForSettingsChanges()
                 }
-				if (setting.isPingEnabled) {
                 launch {
-						Timber.i("Starting ping watcher")
+                    Timber.d("Starting management watcher")
-						watchForPingFailure()
-					}
-				}
-				launch {
-					Timber.i("Starting management watcher")
                     manageVpn()
                 }
             }
     }
 
     private suspend fun watchForMobileDataConnectivityChanges() {
-		withContext(ioDispatcher) {
+        mobileDataService.networkStatus.collect {
-			mobileDataService.networkStatus.collect { status ->
+            when (it) {
-				when (status) {
                 is NetworkStatus.Available -> {
-						Timber.i("Gained Mobile data connection")
+                    Timber.d("Gained Mobile data connection")
-						networkEventsFlow.update {
+                    networkEventsFlow.value =
-							it.copy(
+                        networkEventsFlow.value.copy(
                             isMobileDataConnected = true,
                         )
                 }
-					}
-
                 is NetworkStatus.CapabilitiesChanged -> {
-						networkEventsFlow.update {
+                    networkEventsFlow.value =
-							it.copy(
+                        networkEventsFlow.value.copy(
                             isMobileDataConnected = true,
                         )
+                    Timber.d("Mobile data capabilities changed")
                 }
-						Timber.i("Mobile data capabilities changed")
-					}
-
                 is NetworkStatus.Unavailable -> {
-						networkEventsFlow.update {
+                    networkEventsFlow.value =
-							it.copy(
+                        networkEventsFlow.value.copy(
                             isMobileDataConnected = false,
                         )
+                    Timber.d("Lost mobile data connection")
                 }
-						Timber.i("Lost mobile data connection")
-					}
-				}
-			}
-		}
-	}
-
-	private suspend fun watchForPingFailure() {
-		val context = this
-		withContext(ioDispatcher) {
-			try {
-				do {
-					if (vpnService.vpnState.value.status == TunnelState.UP) {
-						val tunnelConfig = vpnService.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")
-								serviceManager.stopVpnServiceForeground(context)
-								delay(Constants.VPN_RESTART_DELAY)
-								serviceManager.startVpnServiceForeground(context, it.id)
-								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 ->
+        settingsRepository.getSettingsFlow().collect {
-			if (networkEventsFlow.value.settings.isAutoTunnelPaused
+            if (networkEventsFlow.value.settings.isAutoTunnelPaused != it.isAutoTunnelPaused) {
-				!= settings.isAutoTunnelPaused
+                when (it.isAutoTunnelPaused) {
-			) {
-				when (settings.isAutoTunnelPaused) {
                     true -> launchWatcherPausedNotification()
                     false -> launchWatcherNotification()
                 }
             }
-			networkEventsFlow.update {
+            networkEventsFlow.value =
-				it.copy(
+                networkEventsFlow.value.copy(
-					settings = settings,
+                    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() {
-		withContext(ioDispatcher) {
+        ethernetService.networkStatus.collect {
-			ethernetService.networkStatus.collect { status ->
+            when (it) {
-				when (status) {
                 is NetworkStatus.Available -> {
-						Timber.i("Gained Ethernet connection")
+                    Timber.d("Gained Ethernet connection")
-						networkEventsFlow.update {
+                    networkEventsFlow.value =
-							it.copy(
+                        networkEventsFlow.value.copy(
                             isEthernetConnected = true,
                         )
                 }
-					}
-
                 is NetworkStatus.CapabilitiesChanged -> {
-						Timber.i("Ethernet capabilities changed")
+                    Timber.d("Ethernet capabilities changed")
-						networkEventsFlow.update {
+                    networkEventsFlow.value =
-							it.copy(
+                        networkEventsFlow.value.copy(
                             isEthernetConnected = true,
                         )
                 }
-					}
-
                 is NetworkStatus.Unavailable -> {
-						networkEventsFlow.update {
+                    networkEventsFlow.value =
-							it.copy(
+                        networkEventsFlow.value.copy(
                             isEthernetConnected = false,
                         )
-						}
+                    Timber.d("Lost Ethernet connection")
-						Timber.i("Lost Ethernet connection")
-					}
                 }
             }
         }
     }
 
     private suspend fun watchForWifiConnectivityChanges() {
-		withContext(ioDispatcher) {
+        wifiService.networkStatus.collect {
-			wifiService.networkStatus.collect { status ->
+            when (it) {
-				when (status) {
                 is NetworkStatus.Available -> {
-						Timber.i("Gained Wi-Fi connection")
+                    Timber.d("Gained Wi-Fi connection")
-						networkEventsFlow.update {
+                    networkEventsFlow.value =
-							it.copy(
+                        networkEventsFlow.value.copy(
                             isWifiConnected = true,
                         )
                 }
-					}
-
                 is NetworkStatus.CapabilitiesChanged -> {
-						Timber.i("Wifi capabilities changed")
+                    Timber.d("Wifi capabilities changed")
-						networkEventsFlow.update {
+                    networkEventsFlow.value =
-							it.copy(
+                        networkEventsFlow.value.copy(
                             isWifiConnected = true,
                         )
-						}
+                    val ssid = wifiService.getNetworkName(it.networkCapabilities) ?: ""
-						val ssid = wifiService.getNetworkName(status.networkCapabilities)
+                    Timber.d("Detected SSID: $ssid")
-						ssid?.let { name ->
+                    networkEventsFlow.value =
-							if (name.contains(Constants.UNREADABLE_SSID)) {
+                        networkEventsFlow.value.copy(
-								Timber.w("SSID unreadable: missing permissions")
+                            currentNetworkSSID = ssid,
-							} 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 {
+                    networkEventsFlow.value =
-							it.copy(
+                        networkEventsFlow.value.copy(
                             isWifiConnected = false,
                         )
-						}
+                    Timber.d("Lost Wi-Fi connection")
-						Timber.i("Lost Wi-Fi connection")
-					}
                 }
             }
         }
     }
 
-	private suspend fun getMobileDataTunnel(): TunnelConfig? {
+    // TODO clean this up
-		return appDataRepository.tunnels.findByMobileDataTunnel().firstOrNull()
-	}
-
-	private suspend fun getSsidTunnel(ssid: String): TunnelConfig? {
-		return appDataRepository.tunnels.findByTunnelNetworksName(ssid).firstOrNull()
-	}
-
-	private fun isTunnelDown(): Boolean {
-		return vpnService.vpnState.value.status == TunnelState.DOWN
-	}
-
     private suspend fun manageVpn() {
-		val context = this
+        networkEventsFlow.collectLatest {
-		withContext(ioDispatcher) {
+            Timber.i("New watcher state: $it")
-			networkEventsFlow.collectLatest { watcherState ->
+            if (!it.settings.isAutoTunnelPaused && it.settings.defaultTunnel != null) {
-				val autoTunnel = "Auto-tunnel watcher"
+                delay(Constants.TOGGLE_TUNNEL_DELAY)
-				if (!watcherState.settings.isAutoTunnelPaused) {
-					// delay for rapid network state changes and then collect latest
-					delay(Constants.WATCHER_COLLECTION_DELAY)
-					val tunnelConfig = vpnService.vpnState.value.tunnelConfig
                 when {
-						watcherState.isEthernetConditionMet() -> {
+                    ((it.isEthernetConnected &&
-							Timber.i("$autoTunnel - tunnel on on ethernet condition met")
+                        it.settings.isTunnelOnEthernetEnabled &&
-							if (isTunnelDown()) serviceManager.startVpnServiceForeground(context)
+                        !it.isVpnConnected)) -> {
+                        ServiceManager.startVpnServiceForeground(this, it.settings.defaultTunnel!!)
+                        Timber.i("Condition 1 met")
                     }
-
+                    (!it.isEthernetConnected &&
-						watcherState.isMobileDataConditionMet() -> {
+                        it.settings.isTunnelOnMobileDataEnabled &&
-							Timber.i("$autoTunnel - tunnel on mobile data condition met")
+                        !it.isWifiConnected &&
-							val mobileDataTunnel = getMobileDataTunnel()
+                        it.isMobileDataConnected &&
-							val tunnel =
+                        !it.isVpnConnected) -> {
-								mobileDataTunnel ?: appDataRepository.getPrimaryOrFirstTunnel()
+                        ServiceManager.startVpnServiceForeground(this, it.settings.defaultTunnel!!)
-							if (isTunnelDown() || tunnelConfig?.isMobileDataTunnel == false) {
+                        Timber.i("Condition 2 met")
-								serviceManager.startVpnServiceForeground(
-									context,
-									tunnel?.id,
-								)
                     }
+                    (!it.isEthernetConnected &&
+                        !it.settings.isTunnelOnMobileDataEnabled &&
+                        !it.isWifiConnected &&
+                        it.isVpnConnected) -> {
+                        ServiceManager.stopVpnService(this)
+                        Timber.i("Condition 3 met")
                     }
-
+                    (!it.isEthernetConnected &&
-						watcherState.isTunnelOffOnMobileDataConditionMet() -> {
+                        it.isWifiConnected &&
-							Timber.i("$autoTunnel - tunnel off on mobile data met, turning vpn off")
+                        !it.settings.trustedNetworkSSIDs.contains(it.currentNetworkSSID) &&
-							if (!isTunnelDown()) serviceManager.stopVpnServiceForeground(context)
+                        it.settings.isTunnelOnWifiEnabled &&
+                        (!it.isVpnConnected)) -> {
+                        ServiceManager.startVpnServiceForeground(this, it.settings.defaultTunnel!!)
+                        Timber.i("Condition 4 met")
                     }
-
+                    (!it.isEthernetConnected &&
-						watcherState.isUntrustedWifiConditionMet() -> {
+                        (it.isWifiConnected &&
-							if (tunnelConfig?.tunnelNetworks?.contains(watcherState.currentNetworkSSID) == false ||
+                            it.settings.trustedNetworkSSIDs.contains(it.currentNetworkSSID)) &&
-								tunnelConfig == null
+                        (it.isVpnConnected)) -> {
-							) {
+                        ServiceManager.stopVpnService(this)
-								Timber.i(
+                        Timber.i("Condition 5 met")
-									"$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() || tunnelConfig?.id != it.id) {
-										serviceManager.startVpnServiceForeground(
-											context,
-											it.id,
-										)
                     }
-								} ?: suspend {
+                    (!it.isEthernetConnected &&
-									Timber.i("No tunnel associated with this SSID, using defaults")
+                        (it.isWifiConnected &&
-									val default = appDataRepository.getPrimaryOrFirstTunnel()
+                            !it.settings.isTunnelOnWifiEnabled &&
-									if (default?.name != vpnService.name) {
+                            (it.isVpnConnected))) -> {
-										default?.let {
+                        ServiceManager.stopVpnService(this)
-											serviceManager.startVpnServiceForeground(context, it.id)
+                        Timber.i("Condition 6 met")
                     }
+                    (!it.isEthernetConnected &&
+                        !it.isWifiConnected &&
+                        !it.isMobileDataConnected &&
+                        (it.isVpnConnected)) -> {
+                        ServiceManager.stopVpnService(this)
+                        Timber.i("Condition 7 met")
                     }
-								}.invoke()
-							}
-						}
-
-						watcherState.isTrustedWifiConditionMet() -> {
-							Timber.i(
-								"$autoTunnel - tunnel off on trusted wifi condition met, turning vpn off",
-							)
-							if (!isTunnelDown()) serviceManager.stopVpnServiceForeground(context)
-						}
-
-						watcherState.isTunnelOffOnWifiConditionMet() -> {
-							Timber.i(
-								"$autoTunnel - tunnel off on wifi condition met, turning vpn off",
-							)
-							if (!isTunnelDown()) serviceManager.stopVpnServiceForeground(context)
-						}
-
-						watcherState.isTunnelOffOnNoConnectivityMet() -> {
-							Timber.i(
-								"$autoTunnel - tunnel off on no connectivity met, turning vpn off",
-							)
-							if (!isTunnelDown()) serviceManager.stopVpnServiceForeground(context)
-						}
-
                     else -> {
-							Timber.i("$autoTunnel - no condition met")
+                        Timber.i("No condition met")
-						}
                     }
                 }
             }

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

@@ -6,24 +6,21 @@ import android.os.Bundle
 import androidx.core.app.ServiceCompat
 import androidx.lifecycle.lifecycleScope
 import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
+import com.zaneschepke.wireguardautotunnel.data.model.TunnelConfig
-import com.zaneschepke.wireguardautotunnel.module.IoDispatcher
+import com.zaneschepke.wireguardautotunnel.data.repository.SettingsRepository
-import com.zaneschepke.wireguardautotunnel.module.MainImmediateDispatcher
+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.TunnelState
 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.CancellationException
+import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
 import timber.log.Timber
 import javax.inject.Inject
 
@@ -31,32 +28,23 @@ import javax.inject.Inject
 class WireGuardTunnelService : ForegroundService() {
     private val foregroundId = 123
 
-	@Inject
+    @Inject lateinit var vpnService: VpnService
-	lateinit var vpnService: VpnService
 
-	@Inject
+    @Inject lateinit var settingsRepository: SettingsRepository
-	lateinit var appDataRepository: AppDataRepository
 
-	@Inject
+    @Inject lateinit var tunnelConfigRepository: TunnelConfigRepository
-	lateinit var notificationService: NotificationService
 
-	@Inject
+    @Inject lateinit var notificationService: NotificationService
-	@MainImmediateDispatcher
-	lateinit var mainImmediateDispatcher: CoroutineDispatcher
 
-	@Inject
+    private lateinit var job: Job
-	@IoDispatcher
-	lateinit var ioDispatcher: CoroutineDispatcher
-
-	private var job: Job? = null
 
+    private var tunnelName: String = ""
     private var didShowConnected = false
 
     override fun onCreate() {
         super.onCreate()
-		lifecycleScope.launch(mainImmediateDispatcher) {
+        lifecycleScope.launch(Dispatchers.Main) {
-			// TODO fix this to not launch if AOVPN
+            if (tunnelConfigRepository.getAll().isNotEmpty()) {
-			if (appDataRepository.tunnels.count() != 0) {
                 launchVpnNotification()
             }
         }
@@ -65,29 +53,42 @@ class WireGuardTunnelService : ForegroundService() {
     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 {
+            lifecycleScope.launch(Dispatchers.IO) {
                 launch {
-					val tunnelId = extras?.getInt(Constants.TUNNEL_EXTRA_KEY)
+                    if (tunnelConfig != null) {
-					if (vpnService.getState() == TunnelState.UP) {
+                        try {
-						vpnService.stopTunnel()
+                            tunnelName = tunnelConfig.name
+                            vpnService.startTunnel(tunnelConfig)
+                        } catch (e: Exception) {
+                            Timber.e("Problem starting tunnel: ${e.message}")
+                            stopService(extras)
                         }
-					vpnService.startTunnel(
+                    } else {
-						tunnelId?.let {
+                        Timber.d("Tunnel config null, starting default tunnel or first")
-							appDataRepository.tunnels.getById(it)
+                        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 {
-					handshakeNotifications()
-				}
-			}
-	}
-
-	// TODO improve tunnel notifications
-	private suspend fun handshakeNotifications() {
-		withContext(ioDispatcher) {
-			var tunnelName: String? = null
                     vpnService.vpnState.collect { state ->
                         state.statistics
                             ?.mapPeerStats()
@@ -97,44 +98,27 @@ class WireGuardTunnelService : ForegroundService() {
                                     statuses?.all { it == HandshakeStatus.HEALTHY } == true -> {
                                         if (!didShowConnected) {
                                             delay(Constants.VPN_CONNECTED_NOTIFICATION_DELAY)
-									tunnelName = state.tunnelConfig?.name
                                             launchVpnNotification(
                                                 getString(R.string.tunnel_start_title),
-										"${getString(R.string.tunnel_start_text)} - $tunnelName",
+                                                "${getString(R.string.tunnel_start_text)} $tunnelName",
                                             )
                                             didShowConnected = true
                                         }
                                     }
-
                                     statuses?.any { it == HandshakeStatus.STALE } == true -> {}
                                     statuses?.all { it == HandshakeStatus.NOT_STARTED } ==
-								true -> {
+                                        true -> {}
-							}
-
                                     else -> {}
                                 }
                             }
-				if (state.status == TunnelState.UP && state.tunnelConfig?.name != tunnelName) {
-					tunnelName = state.tunnelConfig?.name
-					launchVpnNotification(
-						getString(R.string.tunnel_start_title),
-						"${getString(R.string.tunnel_start_text)} - $tunnelName",
-					)
                     }
                 }
             }
     }
 
-	private fun launchAlwaysOnDisabledNotification() {
+    override fun stopService(extras: Bundle?) {
-		launchVpnNotification(
+        super.stopService(extras)
-			title = this.getString(R.string.vpn_connection_failed),
+        lifecycleScope.launch(Dispatchers.IO) {
-			description = this.getString(R.string.always_on_disabled),
-		)
-	}
-
-	override fun stopService() {
-		super.stopService()
-		lifecycleScope.launch {
             vpnService.stopTunnel()
             didShowConnected = false
         }
@@ -142,7 +126,10 @@ class WireGuardTunnelService : ForegroundService() {
         stopSelf()
     }
 
-	private fun launchVpnNotification(title: String = getString(R.string.vpn_starting), description: String = getString(R.string.attempt_connection)) {
+    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),
@@ -189,10 +176,8 @@ class WireGuardTunnelService : ForegroundService() {
     }
 
     private fun cancelJob() {
-		try {
+        if (this::job.isInitialized) {
-			job?.cancel()
+            job.cancel()
-		} catch (e: CancellationException) {
-			Timber.i("Tunnel job cancelled")
         }
     }
 }

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

@@ -16,7 +16,7 @@ import kotlinx.coroutines.flow.map
 
 abstract class BaseNetworkService<T : BaseNetworkService<T>>(
     val context: Context,
-	networkCapability: Int,
+    networkCapability: Int
 ) : NetworkService<T> {
     private val connectivityManager =
         context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
@@ -24,8 +24,7 @@ abstract class BaseNetworkService<T : BaseNetworkService<T>>(
     private val wifiManager =
         context.applicationContext.getSystemService(Context.WIFI_SERVICE) as WifiManager
 
-	override val networkStatus =
+    override val networkStatus = callbackFlow {
-		callbackFlow {
         val networkStatusCallback =
             when (Build.VERSION.SDK_INT) {
                 in Build.VERSION_CODES.S..Int.MAX_VALUE -> {
@@ -41,7 +40,10 @@ abstract class BaseNetworkService<T : BaseNetworkService<T>>(
                             trySend(NetworkStatus.Unavailable(network))
                         }
 
-							override fun onCapabilitiesChanged(network: Network, networkCapabilities: NetworkCapabilities) {
+                        override fun onCapabilitiesChanged(
+                            network: Network,
+                            networkCapabilities: NetworkCapabilities
+                        ) {
                             trySend(
                                 NetworkStatus.CapabilitiesChanged(
                                     network,
@@ -51,7 +53,6 @@ abstract class BaseNetworkService<T : BaseNetworkService<T>>(
                         }
                     }
                 }
-
                 else -> {
                     object : ConnectivityManager.NetworkCallback() {
                         override fun onAvailable(network: Network) {
@@ -62,7 +63,10 @@ abstract class BaseNetworkService<T : BaseNetworkService<T>>(
                             trySend(NetworkStatus.Unavailable(network))
                         }
 
-							override fun onCapabilitiesChanged(network: Network, networkCapabilities: NetworkCapabilities) {
+                        override fun onCapabilitiesChanged(
+                            network: Network,
+                            networkCapabilities: NetworkCapabilities
+                        ) {
                             trySend(
                                 NetworkStatus.CapabilitiesChanged(
                                     network,
@@ -113,7 +117,7 @@ inline fun <Result> Flow<NetworkStatus>.map(
     crossinline onUnavailable: suspend (network: Network) -> Result,
     crossinline onAvailable: suspend (network: Network) -> Result,
     crossinline onCapabilitiesChanged:
-	suspend (network: Network, networkCapabilities: NetworkCapabilities) -> Result,
+        suspend (network: Network, networkCapabilities: NetworkCapabilities) -> Result
 ): Flow<Result> = map { status ->
     when (status) {
         is NetworkStatus.Unavailable -> onUnavailable(status.network)

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
-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
-constructor(
-	@ApplicationContext context: Context,
-) :
     BaseNetworkService<MobileDataService>(context, NetworkCapabilities.TRANSPORT_CELLULAR)

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
-constructor(
-	@ApplicationContext context: Context,
-) :
     BaseNetworkService<WifiService>(context, NetworkCapabilities.TRANSPORT_WIFI)

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

@@ -9,15 +9,11 @@ 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
-constructor(
-	@ApplicationContext private val context: Context,
-) :
     NotificationService {
     private val notificationManager =
         context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
@@ -63,7 +59,7 @@ constructor(
                 }
         notificationManager.createNotificationChannel(channel)
         val pendingIntent: PendingIntent =
-			Intent(context, SplashActivity::class.java).let { notificationIntent ->
+            Intent(context, MainActivity::class.java).let { notificationIntent ->
                 PendingIntent.getActivity(
                     context,
                     0,
@@ -98,7 +94,7 @@ constructor(
                 .setOngoing(onGoing)
                 .setPriority(NotificationCompat.PRIORITY_HIGH)
                 .setShowWhen(showTimestamp)
-				.setSmallIcon(R.drawable.ic_launcher)
+                .setSmallIcon(R.mipmap.ic_launcher_foreground)
                 .build()
         }
     }

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

@@ -1,76 +1,80 @@
 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.ServiceManager
-import com.zaneschepke.wireguardautotunnel.service.foreground.WireGuardConnectivityWatcherService
 import com.zaneschepke.wireguardautotunnel.service.foreground.WireGuardTunnelService
 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
 
 @AndroidEntryPoint
 class ShortcutsActivity : ComponentActivity() {
-	@Inject
+    @Inject lateinit var settingsRepository: SettingsRepository
-	lateinit var appDataRepository: AppDataRepository
 
-	@Inject
+    @Inject lateinit var tunnelConfigRepository: TunnelConfigRepository
-	lateinit var serviceManager: ServiceManager
 
-	@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?) {
         super.onCreate(savedInstanceState)
-		applicationScope.launch {
+        setContentView(View(this))
-			val settings = appDataRepository.settings.getSettings()
+        if (
+            intent
+                .getStringExtra(CLASS_NAME_EXTRA_KEY)
+                .equals(WireGuardTunnelService::class.java.simpleName)
+        ) {
+            lifecycleScope.launch(Dispatchers.Main) {
+                val settings = settingsRepository.getSettings()
                 if (settings.isShortcutsEnabled) {
-				when (intent.getStringExtra(CLASS_NAME_EXTRA_KEY)) {
+                    try {
-					WireGuardTunnelService::class.java.simpleName -> {
                         val tunnelName = intent.getStringExtra(TUNNEL_NAME_EXTRA_KEY)
                         val tunnelConfig =
-							tunnelName?.let {
+                            if (tunnelName != null) {
-								appDataRepository.tunnels.getAll().firstOrNull {
+                                tunnelConfigRepository.getAll().firstOrNull {
                                     it.name == tunnelName
                                 }
+                            } else {
+                                if (settings.defaultTunnel == null) {
+                                    tunnelConfigRepository.getAll().first()
+                                } else {
+                                    TunnelConfig.from(settings.defaultTunnel!!)
                                 }
+                            }
+                        tunnelConfig ?: return@launch
+                        toggleWatcherServicePause()
                         when (intent.action) {
-							Action.START.name ->
-								serviceManager.startVpnServiceForeground(
-									this@ShortcutsActivity,
-									tunnelConfig?.id,
-									isManualStart = true,
-								)
-
                             Action.STOP.name ->
-								serviceManager.stopVpnServiceForeground(
+                                ServiceManager.stopVpnService(
                                     this@ShortcutsActivity,
-									isManualStop = true,
                                 )
-						}
-					}
-
-					WireGuardConnectivityWatcherService::class.java.simpleName -> {
-						when (intent.action) {
                             Action.START.name ->
-								appDataRepository.settings.save(
+                                ServiceManager.startVpnServiceForeground(
-									settings.copy(
+                                    this@ShortcutsActivity,
-										isAutoTunnelPaused = false,
+                                    tunnelConfig.toString(),
-									),
-								)
-
-							Action.STOP.name ->
-								appDataRepository.settings.save(
-									settings.copy(
-										isAutoTunnelPaused = true,
-									),
                                 )
                         }
+                    } catch (e: Exception) {
+                        Timber.e(e.message)
+                        finish()
                     }
                 }
             }

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

@@ -1,104 +0,0 @@
-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 androidx.lifecycle.LifecycleOwner
-import androidx.lifecycle.ServiceLifecycleDispatcher
-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.service.foreground.ServiceManager
-import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.cancel
-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
-
-	private val dispatcher = ServiceLifecycleDispatcher(this)
-
-	private var manualStartConfig: TunnelConfig? = null
-
-	override fun onStartListening() {
-		super.onStartListening()
-		lifecycleScope.launch {
-			val settings = appDataRepository.settings.getSettings()
-			when (settings.isAutoTunnelEnabled) {
-				true -> {
-					if (settings.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()
-				}
-			}
-		}
-	}
-
-	override fun onTileAdded() {
-		super.onTileAdded()
-		onStartListening()
-	}
-
-	override fun onClick() {
-		super.onClick()
-		unlockAndRun {
-			lifecycleScope.launch {
-				try {
-					appDataRepository.toggleWatcherServicePause()
-					onStartListening()
-				} catch (e: Exception) {
-					Timber.e(e.message)
-				} finally {
-					cancel()
-				}
-			}
-		}
-	}
-
-	private fun setActive() {
-		qsTile.state = Tile.STATE_ACTIVE
-		qsTile.updateTile()
-	}
-
-	private fun setInactive() {
-		qsTile.state = Tile.STATE_INACTIVE
-		qsTile.updateTile()
-	}
-
-	private fun setUnavailable() {
-		manualStartConfig = null
-		qsTile.state = Tile.STATE_UNAVAILABLE
-		qsTile.updateTile()
-	}
-
-	private fun setTileDescription(description: String) {
-		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() = dispatcher.lifecycle
-}

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

@@ -3,82 +3,84 @@ 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.ServiceLifecycleDispatcher
+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.data.repository.AppDataRepository
 import com.zaneschepke.wireguardautotunnel.service.foreground.ServiceManager
-import com.zaneschepke.wireguardautotunnel.service.tunnel.TunnelState
 import com.zaneschepke.wireguardautotunnel.service.tunnel.VpnService
 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
 
 @AndroidEntryPoint
-class TunnelControlTile : TileService(), LifecycleOwner {
+class TunnelControlTile() : TileService() {
-	@Inject
-	lateinit var appDataRepository: AppDataRepository
 
-	@Inject
+    @Inject lateinit var tunnelConfigRepository: TunnelConfigRepository
-	lateinit var vpnService: VpnService
 
-	@Inject
+    @Inject lateinit var settingsRepository: SettingsRepository
-	lateinit var serviceManager: ServiceManager
 
-	private val dispatcher = ServiceLifecycleDispatcher(this)
+    @Inject lateinit var vpnService: VpnService
 
-	private var manualStartConfig: TunnelConfig? = null
+    private val scope = CoroutineScope(Dispatchers.IO)
+
+    private var tunnelName: String? = null
 
     override fun onStartListening() {
         super.onStartListening()
         Timber.d("On start listening called")
-		lifecycleScope.launch {
+        scope.launch {
-			when (vpnService.getState()) {
+            vpnService.vpnState.collect {
-				TunnelState.UP -> {
+                when (it.status) {
-					setActive()
+                    Tunnel.State.UP -> setActive()
-					setTileDescription(vpnService.name)
+                    Tunnel.State.DOWN -> setInactive()
-				}
-
-				TunnelState.DOWN -> {
-					setInactive()
-					val config =
-						appDataRepository.getStartTunnelConfig()?.also { config ->
-							manualStartConfig = config
-						} ?: appDataRepository.getPrimaryOrFirstTunnel()
-					config?.let {
-						setTileDescription(it.name)
-					} ?: setUnavailable()
-				}
-
                     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 onTileAdded() {
+    override fun onDestroy() {
-		super.onTileAdded()
+        super.onDestroy()
-		onStartListening()
+        scope.cancel()
+    }
+
+    override fun onTileRemoved() {
+        super.onTileRemoved()
+        scope.cancel()
     }
 
     override fun onClick() {
         super.onClick()
         unlockAndRun {
-			lifecycleScope.launch {
+            scope.launch {
                 try {
-					if (vpnService.getState() == TunnelState.UP) {
+                    val tunnelConfig =
-						serviceManager.stopVpnServiceForeground(
+                        tunnelConfigRepository.getAll().first { it.name == tunnelName }
-							this@TunnelControlTile,
+                    toggleWatcherServicePause()
-							isManualStop = true,
+                    if (vpnService.getState() == Tunnel.State.UP) {
-						)
+                        ServiceManager.stopVpnService(this@TunnelControlTile)
                     } else {
-						serviceManager.startVpnServiceForeground(
+                        ServiceManager.startVpnServiceForeground(
                             this@TunnelControlTile,
-							manualStartConfig?.id,
+                            tunnelConfig.toString(),
-							isManualStart = true,
                         )
                     }
                 } catch (e: Exception) {
@@ -90,6 +92,20 @@ class TunnelControlTile : TileService(), LifecycleOwner {
         }
     }
 
+    private fun toggleWatcherServicePause() {
+        scope.launch {
+            val settings = settingsRepository.getSettings()
+            if (settings.isAutoTunnelEnabled) {
+                val pauseAutoTunnel = !settings.isAutoTunnelPaused
+                settingsRepository.save(
+                    settings.copy(
+                        isAutoTunnelPaused = pauseAutoTunnel,
+                    ),
+                )
+            }
+        }
+    }
+
     private fun setActive() {
         qsTile.state = Tile.STATE_ACTIVE
         qsTile.updateTile()
@@ -101,7 +117,6 @@ class TunnelControlTile : TileService(), LifecycleOwner {
     }
 
     private fun setUnavailable() {
-		manualStartConfig = null
         qsTile.state = Tile.STATE_UNAVAILABLE
         qsTile.updateTile()
     }
@@ -115,7 +130,4 @@ class TunnelControlTile : TileService(), LifecycleOwner {
         }
         qsTile.updateTile()
     }
-
-	override val lifecycle: Lifecycle
-		get() = dispatcher.lifecycle
 }

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

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

app/src/main/java/com/zaneschepke/wireguardautotunnel/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

@@ -1,15 +1,15 @@
 package com.zaneschepke.wireguardautotunnel.service.tunnel
 
 import com.wireguard.android.backend.Tunnel
-import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
+import com.zaneschepke.wireguardautotunnel.data.model.TunnelConfig
 import kotlinx.coroutines.flow.StateFlow
 
-interface VpnService : Tunnel, org.amnezia.awg.backend.Tunnel {
+interface VpnService : Tunnel {
-	suspend fun startTunnel(tunnelConfig: TunnelConfig? = null): TunnelState
+    suspend fun startTunnel(tunnelConfig: TunnelConfig): Tunnel.State
 
     suspend fun stopTunnel()
 
     val vpnState: StateFlow<VpnState>
 
-	fun getState(): TunnelState
+    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

@@ -2,138 +2,82 @@ 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 kotlinx.coroutines.CancellationException
-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 userspaceAmneziaBackend: 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,
-	@ApplicationScope private val applicationScope: CoroutineScope,
-	@IoDispatcher private val ioDispatcher: CoroutineDispatcher,
 ) : VpnService {
     private val _vpnState = MutableStateFlow(VpnState())
     override val vpnState: StateFlow<VpnState> = _vpnState.asStateFlow()
 
-	private var statsJob: Job? = null
+    private val scope = CoroutineScope(Dispatchers.IO)
 
-	private var backendIsWgUserspace = true
+    private lateinit var statsJob: Job
 
-	private var backendIsAmneziaUserspace = false
+    private var config: Config? = null
+
+    private var backend: Backend = userspaceBackend
+
+    private var backendIsUserspace = true
 
     init {
-		applicationScope.launch(ioDispatcher) {
+        scope.launch {
-			appDataRepository.settings.getSettingsFlow().collect {
+            settingsRepository.getSettingsFlow().collect {
-				if (it.isKernelEnabled && (backendIsWgUserspace || backendIsAmneziaUserspace)) {
+                if (it.isKernelEnabled && backendIsUserspace) {
-					Timber.i("Setting kernel backend")
+                    Timber.d("Setting kernel backend")
-					backendIsWgUserspace = false
+                    backend = kernelBackend
-					backendIsAmneziaUserspace = false
+                    backendIsUserspace = false
-				} else if (!it.isKernelEnabled && !it.isAmneziaEnabled && !backendIsWgUserspace) {
+                } else if (!it.isKernelEnabled && !backendIsUserspace) {
-					Timber.i("Setting WireGuard userspace backend")
+                    Timber.d("Setting userspace backend")
-					backendIsWgUserspace = true
+                    backend = userspaceBackend
-					backendIsAmneziaUserspace = false
+                    backendIsUserspace = true
-				} else if (it.isAmneziaEnabled && !backendIsAmneziaUserspace) {
-					Timber.i("Setting Amnezia userspace backend")
-					backendIsAmneziaUserspace = true
-					backendIsWgUserspace = false
                 }
             }
         }
     }
 
-	private fun setState(tunnelConfig: TunnelConfig?, tunnelState: TunnelState): TunnelState {
+    override suspend fun startTunnel(tunnelConfig: TunnelConfig): State {
-		return if (backendIsAmneziaUserspace) {
+        return try {
-			Timber.i("Using Amnezia backend")
+            stopTunnelOnConfigChange(tunnelConfig)
-			val config =
+            emitTunnelName(tunnelConfig.name)
-				tunnelConfig?.let {
+            config = TunnelConfig.configFromQuick(tunnelConfig.wgQuick)
-					if (it.amQuick != "") {
-						TunnelConfig.configFromAmQuick(it.amQuick)
-					} else {
-						Timber.w(
-							"Using backwards compatible wg config, amnezia specific config not found.",
-						)
-						TunnelConfig.configFromAmQuick(it.wgQuick)
-					}
-				}
             val state =
-				userspaceAmneziaBackend.get().setState(this, tunnelState.toAmState(), config)
+                backend.setState(
-			TunnelState.from(state)
-		} else {
-			Timber.i("Using Wg backend")
-			val wgConfig = tunnelConfig?.let { TunnelConfig.configFromWgQuick(it.wgQuick) }
-			val state =
-				backend().setState(
                     this,
-					tunnelState.toWgState(),
+                    State.UP,
-					wgConfig,
+                    config,
                 )
-			TunnelState.from(state)
+            emitTunnelState(state)
-		}
+            state
-	}
+        } catch (e: Exception) {
-
-	override suspend fun startTunnel(tunnelConfig: TunnelConfig?): TunnelState {
-		return withContext(ioDispatcher) {
-			try {
-				// TODO we need better error handling here
-				// need to bubble up these errors to the UI
-				val config = tunnelConfig ?: appDataRepository.getPrimaryOrFirstTunnel()
-				if (config != null) {
-					emitTunnelConfig(config)
-					setState(config, TunnelState.UP)
-				} else {
-					throw Exception("No tunnels")
-				}
-			} catch (e: BackendException) {
             Timber.e("Failed to start tunnel with error: ${e.message}")
-				TunnelState.from(State.DOWN)
+            State.DOWN
-			}
         }
     }
 
-	private fun backend(): Backend {
+    private fun emitTunnelState(state: State) {
-		return when {
-			backendIsWgUserspace -> {
-				userspaceBackend.get()
-			}
-
-			!backendIsWgUserspace && !backendIsAmneziaUserspace -> {
-				kernelBackend.get()
-			}
-
-			else -> {
-				userspaceBackend.get()
-			}
-		}
-	}
-
-	private fun emitTunnelState(state: TunnelState) {
         _vpnState.tryEmit(
             _vpnState.value.copy(
                 status = state,
@@ -141,7 +85,7 @@ constructor(
         )
     }
 
-	private fun emitBackendStatistics(statistics: TunnelStatistics) {
+    private fun emitBackendStatistics(statistics: Statistics) {
         _vpnState.tryEmit(
             _vpnState.value.copy(
                 statistics = statistics,
@@ -149,85 +93,57 @@ constructor(
         )
     }
 
-	private suspend fun emitTunnelConfig(tunnelConfig: TunnelConfig?) {
+    private suspend fun emitTunnelName(name: String) {
         _vpnState.emit(
             _vpnState.value.copy(
-				tunnelConfig = tunnelConfig,
+                name = name,
             ),
         )
     }
 
-	private fun resetVpnState() {
+    private suspend fun stopTunnelOnConfigChange(tunnelConfig: TunnelConfig) {
-		_vpnState.tryEmit(VpnState())
+        if (getState() == State.UP && _vpnState.value.name != tunnelConfig.name) {
-	}
+            stopTunnel()
-
-	override suspend fun stopTunnel() {
-		withContext(ioDispatcher) {
-			try {
-				if (getState() == TunnelState.UP) {
-					val state = setState(null, TunnelState.DOWN)
-					resetVpnState()
-					emitTunnelState(state)
-				}
-			} catch (e: BackendException) {
-				Timber.e("Failed to stop wireguard tunnel with error: ${e.message}")
-			} catch (e: org.amnezia.awg.backend.BackendException) {
-				Timber.e("Failed to stop amnezia tunnel with error: ${e.message}")
-			}
-		}
-	}
-
-	override fun getState(): TunnelState {
-		return if (backendIsAmneziaUserspace) {
-			TunnelState.from(
-				userspaceAmneziaBackend.get().getState(this),
-			)
-		} else {
-			TunnelState.from(backend().getState(this))
         }
     }
 
     override fun getName(): String {
-		return _vpnState.value.tunnelConfig?.name ?: ""
+        return _vpnState.value.name
     }
 
-	override fun onStateChange(newState: Tunnel.State) {
+    override suspend fun stopTunnel() {
-		handleStateChange(TunnelState.from(newState))
-	}
-
-	private fun handleStateChange(state: TunnelState) {
-		emitTunnelState(state)
-		WireGuardAutoTunnel.requestTunnelTileServiceStateUpdate()
-		if (state == TunnelState.UP) {
-			statsJob = startTunnelStatisticsJob()
-		}
-		if (state == TunnelState.DOWN) {
         try {
-				statsJob?.cancel()
+            if (getState() == State.UP) {
-			} catch (e: CancellationException) {
+                val state = backend.setState(this, State.DOWN, null)
-				Timber.i("Stats job cancelled")
+                emitTunnelState(state)
             }
+        } catch (e: BackendException) {
+            Timber.e("Failed to stop tunnel with error: ${e.message}")
         }
     }
 
-	private fun startTunnelStatisticsJob() = applicationScope.launch(ioDispatcher) {
+    override fun getState(): State {
-		while (true) {
+        return backend.getState(this)
-			if (backendIsAmneziaUserspace) {
-				emitBackendStatistics(
-					AmneziaStatistics(
-						userspaceAmneziaBackend.get().getStatistics(this@WireGuardTunnel),
-					),
-				)
-			} else {
-				emitBackendStatistics(
-					WireGuardStatistics(backend().getStatistics(this@WireGuardTunnel)),
-				)
-			}
-			delay(Constants.VPN_STATISTIC_CHECK_INTERVAL)
-		}
     }
 
     override fun onStateChange(state: State) {
-		handleStateChange(TunnelState.from(state))
+        val tunnel = this
+        emitTunnelState(state)
+        WireGuardAutoTunnel.requestTileServiceStateUpdate()
+        if (state == State.UP) {
+            statsJob =
+                scope.launch {
+                    while (true) {
+                        val statistics = backend.getStatistics(tunnel)
+                        emitBackendStatistics(statistics)
+                        delay(Constants.VPN_STATISTIC_CHECK_INTERVAL)
+                    }
+                }
+        }
+        if (state == State.DOWN) {
+            if (this::statsJob.isInitialized) {
+                statsJob.cancel()
+            }
+        }
     }
 }

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,9 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.ui
-
-data class AppUiState(
-	val snackbarMessage: String = "",
-	val snackbarMessageConsumed: Boolean = true,
-	val vpnPermissionAccepted: Boolean = false,
-	val notificationPermissionAccepted: Boolean = false,
-	val requestPermissions: Boolean = false,
-)

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

@@ -1,123 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.ui
-
-import android.content.ActivityNotFoundException
-import android.content.Context
-import android.content.Intent
-import android.net.Uri
-import androidx.lifecycle.ViewModel
-import com.wireguard.android.backend.GoBackend
-import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.WireGuardAutoTunnel
-import com.zaneschepke.wireguardautotunnel.util.Constants
-import dagger.hilt.android.lifecycle.HiltViewModel
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.asStateFlow
-import kotlinx.coroutines.flow.update
-import timber.log.Timber
-import javax.inject.Inject
-
-@HiltViewModel
-class AppViewModel
-@Inject
-constructor() : ViewModel() {
-	val vpnIntent: Intent? = GoBackend.VpnService.prepare(WireGuardAutoTunnel.instance)
-
-	private val _appUiState =
-		MutableStateFlow(
-			AppUiState(
-				vpnPermissionAccepted = vpnIntent == null,
-			),
-		)
-	val appUiState = _appUiState.asStateFlow()
-
-	fun isRequiredPermissionGranted(): Boolean {
-		val allAccepted =
-			(_appUiState.value.vpnPermissionAccepted && _appUiState.value.vpnPermissionAccepted)
-		if (!allAccepted) requestPermissions()
-		return allAccepted
-	}
-
-	private fun requestPermissions() {
-		_appUiState.update {
-			it.copy(
-				requestPermissions = true,
-			)
-		}
-	}
-
-	fun permissionsRequested() {
-		_appUiState.update {
-			it.copy(
-				requestPermissions = false,
-			)
-		}
-	}
-
-	fun openWebPage(url: String, context: Context) {
-		try {
-			val webpage: Uri = Uri.parse(url)
-			val intent =
-				Intent(Intent.ACTION_VIEW, webpage).apply {
-					addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-				}
-			context.startActivity(intent)
-		} catch (e: ActivityNotFoundException) {
-			Timber.e(e)
-			showSnackbarMessage(context.getString(R.string.no_browser_detected))
-		}
-	}
-
-	fun onVpnPermissionAccepted() {
-		_appUiState.update {
-			it.copy(
-				vpnPermissionAccepted = true,
-			)
-		}
-	}
-
-	fun launchEmail(context: Context) {
-		try {
-			val intent =
-				Intent(Intent.ACTION_SENDTO).apply {
-					type = Constants.EMAIL_MIME_TYPE
-					putExtra(Intent.EXTRA_EMAIL, arrayOf(context.getString(R.string.my_email)))
-					putExtra(Intent.EXTRA_SUBJECT, context.getString(R.string.email_subject))
-					addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-				}
-			context.startActivity(
-				Intent.createChooser(intent, context.getString(R.string.email_chooser)).apply {
-					addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-				},
-			)
-		} catch (e: ActivityNotFoundException) {
-			Timber.e(e)
-			showSnackbarMessage(context.getString(R.string.no_email_detected))
-		}
-	}
-
-	fun showSnackbarMessage(message: String) {
-		_appUiState.update {
-			it.copy(
-				snackbarMessage = message,
-				snackbarMessageConsumed = false,
-			)
-		}
-	}
-
-	fun snackbarMessageConsumed() {
-		_appUiState.update {
-			it.copy(
-				snackbarMessage = "",
-				snackbarMessageConsumed = true,
-			)
-		}
-	}
-
-	fun setNotificationPermissionAccepted(accepted: Boolean) {
-		_appUiState.update {
-			it.copy(
-				notificationPermissionAccepted = accepted,
-			)
-		}
-	}
-}

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,19 +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.foundation.focusable
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.SnackbarData
@@ -21,7 +18,6 @@ import androidx.compose.material3.SnackbarDuration
 import androidx.compose.material3.SnackbarHost
 import androidx.compose.material3.SnackbarHostState
 import androidx.compose.material3.SnackbarResult
-import androidx.compose.material3.Text
 import androidx.compose.material3.surfaceColorAtElevation
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
@@ -31,176 +27,121 @@ 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.res.stringResource
 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.google.accompanist.permissions.isGranted
 import com.google.accompanist.permissions.rememberPermissionState
-import com.google.accompanist.permissions.shouldShowRationale
+import com.wireguard.android.backend.GoBackend
 import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.WireGuardAutoTunnel
-import com.zaneschepke.wireguardautotunnel.data.repository.AppStateRepository
+import com.zaneschepke.wireguardautotunnel.data.datastore.DataStoreManager
 import com.zaneschepke.wireguardautotunnel.data.repository.SettingsRepository
-import com.zaneschepke.wireguardautotunnel.service.foreground.ServiceManager
+import com.zaneschepke.wireguardautotunnel.ui.common.PermissionRequestFailedScreen
-import com.zaneschepke.wireguardautotunnel.ui.common.dialog.InfoDialog
 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.StringValue
+import com.zaneschepke.wireguardautotunnel.util.Constants
 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
-	lateinit var settingsRepository: SettingsRepository
+    lateinit var dataStoreManager: DataStoreManager
-
-	@Inject
-	lateinit var serviceManager: ServiceManager
 
+    @Inject lateinit var settingsRepository: SettingsRepository
     @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
-
-		enableEdgeToEdge(navigationBarStyle = SystemBarStyle.dark(Color.Transparent.toArgb()))
-
         lifecycleScope.launch {
-			WireGuardAutoTunnel.requestTunnelTileServiceStateUpdate()
+            try {
-			val settings = settingsRepository.getSettings()
+                dataStoreManager.init()
-			if (settings.isAutoTunnelEnabled) {
+                if (settingsRepository.getAll().isEmpty()) {
-				serviceManager.startWatcherService(application.applicationContext)
+                    settingsRepository.save(com.zaneschepke.wireguardautotunnel.data.model.Settings())
+                }
+                WireGuardAutoTunnel.requestTileServiceStateUpdate()
+            } catch (e: IOException) {
+                Timber.e("Failed to load preferences")
             }
         }
-
         setContent {
-			val appViewModel = hiltViewModel<AppViewModel>()
+            //            val activityViewModel = hiltViewModel<ActivityViewModel>()
-			val appUiState by appViewModel.appUiState.collectAsStateWithLifecycle()
-			val navController = rememberNavController()
-			val navBackStackEntry by navController.currentBackStackEntryAsState()
-			var showVpnPermissionDialog by remember { mutableStateOf(false) }
 
-			val notificationPermissionState =
+            val navController = rememberNavController()
-				if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            val focusRequester = remember { FocusRequester() }
-					rememberPermissionState(Manifest.permission.POST_NOTIFICATIONS)
+
-				} else {
+            WireguardAutoTunnelTheme {
-					null
+                TransparentSystemBars()
-				}
 
                 val snackbarHostState = remember { SnackbarHostState() }
 
+                val notificationPermissionState =
+                    rememberPermissionState(Manifest.permission.POST_NOTIFICATIONS)
+
+                fun requestNotificationPermission() {
+                    if (
+                        !notificationPermissionState.status.isGranted &&
+                            Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU
+                    ) {
+                        notificationPermissionState.launchPermissionRequest()
+                    }
+                }
+
+                var vpnIntent by remember { mutableStateOf(GoBackend.VpnService.prepare(this)) }
                 val vpnActivityResultState =
                     rememberLauncherForActivityResult(
                         ActivityResultContracts.StartActivityForResult(),
                         onResult = {
                             val accepted = (it.resultCode == RESULT_OK)
                             if (accepted) {
-							appViewModel.onVpnPermissionAccepted()
+                                vpnIntent = null
-						} else {
-							showVpnPermissionDialog = true
                             }
                         },
                     )
+                LaunchedEffect(vpnIntent) {
+                    if (vpnIntent != null) {
+                        vpnActivityResultState.launch(vpnIntent)
+                    } else {
+                        requestNotificationPermission()
+                    }
+                }
 
-			fun showSnackBarMessage(message: StringValue) {
+                fun showSnackBarMessage(message: String) {
                     lifecycleScope.launch(Dispatchers.Main) {
                         val result =
                             snackbarHostState.showSnackbar(
-							message = message.asString(this@MainActivity),
+                                message = message,
+                                actionLabel = applicationContext.getString(R.string.okay),
                                 duration = SnackbarDuration.Short,
                             )
                         when (result) {
                             SnackbarResult.ActionPerformed,
-						SnackbarResult.Dismissed,
+                            SnackbarResult.Dismissed -> {
-						-> {
                                 snackbarHostState.currentSnackbarData?.dismiss()
                             }
                         }
                     }
                 }
 
-			LaunchedEffect(appUiState.requestPermissions) {
-				if (appUiState.requestPermissions) {
-					appViewModel.permissionsRequested()
-					if (notificationPermissionState != null && !notificationPermissionState.status.isGranted
-					) {
-						notificationPermissionState.launchPermissionRequest()
-						return@LaunchedEffect if (notificationPermissionState.status.shouldShowRationale || !notificationPermissionState.status.isGranted) {
-							showSnackBarMessage(
-								StringValue.StringResource(R.string.notification_permission_required),
-							)
-						} else {
-							Unit
-						}
-					}
-					if (!appUiState.vpnPermissionAccepted) {
-						return@LaunchedEffect appViewModel.vpnIntent?.let {
-							vpnActivityResultState.launch(
-								it,
-							)
-						} ?: Unit
-					}
-				}
-			}
-
-			WireguardAutoTunnelTheme {
-				LaunchedEffect(Unit) {
-					appViewModel.setNotificationPermissionAccepted(
-						notificationPermissionState?.status?.isGranted ?: true,
-					)
-				}
-
-				LaunchedEffect(appUiState.snackbarMessageConsumed) {
-					if (!appUiState.snackbarMessageConsumed) {
-						showSnackBarMessage(StringValue.DynamicString(appUiState.snackbarMessage))
-						appViewModel.snackbarMessageConsumed()
-					}
-				}
-
-				val focusRequester = remember { FocusRequester() }
-
-				if (showVpnPermissionDialog) {
-					InfoDialog(
-						onDismiss = { showVpnPermissionDialog = false },
-						onAttest = { showVpnPermissionDialog = false },
-						title = { Text(text = stringResource(R.string.vpn_denied_dialog_title)) },
-						body = {
-							Column(verticalArrangement = Arrangement.spacedBy(15.dp)) {
-								Text(text = stringResource(R.string.vpn_denied_dialog_message))
-								Text(text = stringResource(R.string.vpn_denied_dialog_message2))
-							}
-						},
-						confirmText = { Text(text = stringResource(R.string.okay)) },
-					)
-				}
-
                 Scaffold(
                     snackbarHost = {
                         SnackbarHost(snackbarHostState) { snackbarData: SnackbarData ->
@@ -214,17 +155,10 @@ class MainActivity : AppCompatActivity() {
                             )
                         }
                     },
-					// TODO refactor
+                    modifier = Modifier.focusable().focusProperties { up = focusRequester },
-					modifier =
+                    bottomBar =
-					Modifier
+                        if (vpnIntent == null && notificationPermissionState.status.isGranted) {
-						.focusable()
+                            {
-						.focusProperties {
-							when (navBackStackEntry?.destination?.route) {
-								Screen.Lock.route -> Unit
-								else -> up = focusRequester
-							}
-						},
-					bottomBar = {
                                 BottomNavBar(
                                     navController,
                                     listOf(
@@ -233,22 +167,47 @@ class MainActivity : AppCompatActivity() {
                                         Screen.Support.navItem,
                                     ),
                                 )
+                            }
+                        } else {
+                            {}
                         },
                 ) { padding ->
-					NavHost(
+                    if (vpnIntent != null) {
-						navController,
+                        PermissionRequestFailedScreen(
-						startDestination = (if (isPinLockEnabled == true) Screen.Lock.route else Screen.Main.route),
+                            padding = padding,
-						modifier =
+                            onRequestAgain = { vpnActivityResultState.launch(vpnIntent) },
-						Modifier
+                            message = getString(R.string.vpn_permission_required),
-							.padding(padding)
+                            getString(R.string.retry),
-							.fillMaxSize(),
+                        )
-					) {
+                        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,
-								appViewModel = appViewModel,
+                                showSnackbarMessage = { message -> showSnackBarMessage(message) },
                                 navController = navController,
                             )
                         }
@@ -256,8 +215,8 @@ class MainActivity : AppCompatActivity() {
                             Screen.Settings.route,
                         ) {
                             SettingsScreen(
-								appViewModel = appViewModel,
+                                padding = padding,
-								navController = navController,
+                                showSnackbarMessage = { message -> showSnackBarMessage(message) },
                                 focusRequester = focusRequester,
                             )
                         }
@@ -265,60 +224,25 @@ class MainActivity : AppCompatActivity() {
                             Screen.Support.route,
                         ) {
                             SupportScreen(
+                                padding = padding,
                                 focusRequester = focusRequester,
-								appViewModel = appViewModel,
+                                showSnackbarMessage = { message -> showSnackBarMessage(message) },
-								navController = navController,
                             )
                         }
-						composable(Screen.Support.Logs.route) {
+                        composable("${Screen.Config.route}/{id}") {
-							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()) {
+                                // https://dagger.dev/hilt/view-model#assisted-injection
                                 ConfigScreen(
                                     navController = navController,
-									tunnelId = id,
+                                    id = id,
-									appViewModel = appViewModel,
+                                    showSnackbarMessage = { message ->
-									focusRequester = focusRequester,
+                                        showSnackBarMessage(message)
-									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,
-							)
-						}
                     }
                 }
             }

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

@@ -4,15 +4,13 @@ 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") {
         val navItem =
             BottomNavItem(
-				name = WireGuardAutoTunnel.instance.getString(R.string.tunnels),
+                name = "Tunnels",
                 route = route,
                 icon = Icons.Rounded.Home,
             )
@@ -21,7 +19,7 @@ sealed class Screen(val route: String) {
     data object Settings : Screen("settings") {
         val navItem =
             BottomNavItem(
-				name = WireGuardAutoTunnel.instance.getString(R.string.settings),
+                name = "Settings",
                 route = route,
                 icon = Icons.Rounded.Settings,
             )
@@ -30,17 +28,11 @@ sealed class Screen(val route: String) {
     data object Support : Screen("support") {
         val navItem =
             BottomNavItem(
-				name = WireGuardAutoTunnel.instance.getString(R.string.support),
+                name = "Support",
                 route = route,
                 icon = Icons.Rounded.QuestionMark,
             )
-
-		data object Logs : Screen("support/logs")
     }
 
     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,67 +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.logcatter.LocalLogCollector
-import com.zaneschepke.wireguardautotunnel.WireGuardAutoTunnel
-import com.zaneschepke.wireguardautotunnel.WireGuardAutoTunnel.Companion.isRunningOnAndroidTv
-import com.zaneschepke.wireguardautotunnel.data.repository.AppStateRepository
-import com.zaneschepke.wireguardautotunnel.module.ApplicationScope
-import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.launch
-import xyz.teamgravity.pin_lock_compose.PinManager
-import javax.inject.Inject
-
-@SuppressLint("CustomSplashScreen")
-@AndroidEntryPoint
-class SplashActivity : ComponentActivity() {
-	@Inject
-	lateinit var appStateRepository: AppStateRepository
-
-	@Inject
-	lateinit var localLogCollector: LocalLogCollector
-
-	@Inject
-	@ApplicationScope
-	lateinit var applicationScope: CoroutineScope
-
-	override fun onCreate(savedInstanceState: Bundle?) {
-		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-			val splashScreen = installSplashScreen()
-			splashScreen.setKeepOnScreenCondition { true }
-		}
-		super.onCreate(savedInstanceState)
-
-		applicationScope.launch {
-			if (!isRunningOnAndroidTv()) localLogCollector.start()
-		}
-
-		lifecycleScope.launch {
-			repeatOnLifecycle(Lifecycle.State.CREATED) {
-				val pinLockEnabled = appStateRepository.isPinLockEnabled()
-				if (pinLockEnabled) {
-					PinManager.initialize(WireGuardAutoTunnel.instance)
-				}
-
-				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,9 +10,17 @@ 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(
+    onClick: () -> Unit,
+    onIconClick: () -> Unit,
+    text: String,
+    icon: ImageVector,
+    enabled: Boolean
+) {
     TextButton(
         onClick = onClick,
         enabled = enabled,
@@ -21,12 +29,9 @@ fun ClickableIconButton(onClick: () -> Unit, onIconClick: () -> Unit, text: Stri
         Spacer(modifier = Modifier.size(ButtonDefaults.IconSpacing))
         Icon(
             imageVector = icon,
-			contentDescription = icon.name,
+            contentDescription = stringResource(R.string.delete),
             modifier =
-			Modifier
+                Modifier.size(ButtonDefaults.IconSize).weight(1f, false).clickable {
-				.size(ButtonDefaults.IconSize)
-				.weight(1f, false)
-				.clickable {
                     if (enabled) {
                         onIconClick()
                     }

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

@@ -0,0 +1,38 @@
+package com.zaneschepke.wireguardautotunnel.ui.common
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.Button
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.unit.dp
+import kotlinx.coroutines.launch
+
+@Composable
+fun PermissionRequestFailedScreen(
+    padding: PaddingValues,
+    onRequestAgain: () -> Unit,
+    message: String,
+    buttonText: String
+) {
+    val scope = rememberCoroutineScope()
+    Column(
+        horizontalAlignment = Alignment.CenterHorizontally,
+        verticalArrangement = Arrangement.Center,
+        modifier = Modifier.fillMaxSize().padding(padding),
+    ) {
+        Text(message, textAlign = TextAlign.Center, modifier = Modifier.padding(15.dp))
+        Button(
+            onClick = { scope.launch { onRequestAgain() } },
+        ) {
+            Text(buttonText)
+        }
+    }
+}

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

@@ -15,12 +15,9 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
-import androidx.compose.ui.focus.FocusRequester
-import androidx.compose.ui.focus.focusRequester
-import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import com.zaneschepke.wireguardautotunnel.service.tunnel.statistics.TunnelStatistics
+import com.wireguard.android.backend.Statistics
 import com.zaneschepke.wireguardautotunnel.util.NumberUtils
 import com.zaneschepke.wireguardautotunnel.util.toThreeDecimalPlaceString
 
@@ -33,14 +30,11 @@ fun RowListItem(
     onClick: () -> Unit,
     rowButton: @Composable () -> Unit,
     expanded: Boolean,
-	statistics: TunnelStatistics?,
+    statistics: Statistics?
-	focusRequester: FocusRequester,
 ) {
     Box(
         modifier =
-		Modifier
+            Modifier.animateContentSize()
-			.focusRequester(focusRequester)
-			.animateContentSize()
                 .clip(RoundedCornerShape(30.dp))
                 .combinedClickable(
                     onClick = { onClick() },
@@ -49,36 +43,31 @@ fun RowListItem(
     ) {
         Column {
             Row(
-				modifier =
+                modifier = Modifier.fillMaxWidth().padding(horizontal = 15.dp, vertical = 5.dp),
-				Modifier
-					.fillMaxWidth()
-					.padding(horizontal = 15.dp, vertical = 5.dp),
                 verticalAlignment = Alignment.CenterVertically,
                 horizontalArrangement = Arrangement.SpaceBetween,
             ) {
                 Row(
                     verticalAlignment = Alignment.CenterVertically,
-					modifier = Modifier.fillMaxWidth(13 / 20f),
+                    modifier = Modifier.fillMaxWidth(.60f),
                 ) {
                     icon()
-					Text(text, maxLines = 1, overflow = TextOverflow.Ellipsis)
+                    Text(text)
                 }
                 rowButton()
             }
             if (expanded) {
-				statistics?.getPeers()?.forEach {
+                statistics?.peers()?.forEach {
                     Row(
                         modifier =
-						Modifier
+                            Modifier.fillMaxWidth()
-							.fillMaxWidth()
                                 .padding(end = 10.dp, bottom = 10.dp, start = 10.dp),
                         verticalAlignment = Alignment.CenterVertically,
                         horizontalArrangement = Arrangement.SpaceEvenly,
                     ) {
-						// TODO change these to string resources
+                        val handshakeEpoch = statistics.peer(it)!!.latestHandshakeEpochMillis
-						val handshakeEpoch = statistics.peerStats(it)!!.latestHandshakeEpochMillis
+                        val peerTx = statistics.peer(it)!!.txBytes
-						val peerTx = statistics.peerStats(it)!!.txBytes
+                        val peerRx = statistics.peer(it)!!.rxBytes
-						val peerRx = statistics.peerStats(it)!!.rxBytes
                         val peerId = it.toBase64().subSequence(0, 3).toString() + "***"
                         val handshakeSec =
                             NumberUtils.getSecondsBetweenTimestampAndNow(handshakeEpoch)

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

@@ -44,21 +44,19 @@ fun SearchBar(onQuery: (queryString: String) -> Unit) {
             onQuery(onQueryChanged)
         },
         leadingIcon = {
-			val icon = Icons.Rounded.Search
             Icon(
-				imageVector = icon,
+                imageVector = Icons.Rounded.Search,
                 tint = MaterialTheme.colorScheme.onBackground,
-				contentDescription = icon.name,
+                contentDescription = stringResource(id = R.string.search_icon),
             )
         },
         trailingIcon = {
             if (showClearIcon) {
                 IconButton(onClick = { query = "" }) {
-					val icon = Icons.Rounded.Clear
                     Icon(
-						imageVector = icon,
+                        imageVector = Icons.Rounded.Clear,
                         tint = MaterialTheme.colorScheme.onBackground,
-						contentDescription = icon.name,
+                        contentDescription = stringResource(id = R.string.clear_icon),
                     )
                 }
             }
@@ -75,8 +73,7 @@ fun SearchBar(onQuery: (queryString: String) -> Unit) {
         singleLine = true,
         keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Text),
         modifier =
-		Modifier
+            Modifier.fillMaxWidth()
-			.fillMaxWidth()
                 .background(color = MaterialTheme.colorScheme.background, shape = RectangleShape),
     )
 }

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

@@ -16,7 +16,7 @@ fun ConfigurationTextBox(
     onValueChange: (String) -> Unit,
     keyboardActions: KeyboardActions,
     label: String,
-	modifier: Modifier,
+    modifier: Modifier
 ) {
     OutlinedTextField(
         modifier = modifier,

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

@@ -9,30 +9,23 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.Dp
 
 @Composable
-fun ConfigurationToggle(label: String, enabled: Boolean, checked: Boolean, padding: Dp, onCheckChanged: () -> Unit, modifier: Modifier = Modifier) {
+fun ConfigurationToggle(
+    label: String,
+    enabled: Boolean,
+    checked: Boolean,
+    padding: Dp,
+    onCheckChanged: () -> Unit,
+    modifier: Modifier = Modifier
+) {
     Row(
-		modifier =
+        modifier = Modifier.fillMaxWidth().padding(padding),
-		Modifier
-			.fillMaxWidth()
-			.padding(padding),
         verticalAlignment = Alignment.CenterVertically,
         horizontalArrangement = Arrangement.SpaceBetween,
     ) {
-		Text(
+        Text(label)
-			label,
-			textAlign = TextAlign.Start,
-			modifier =
-			Modifier
-				.weight(
-					weight = 1.0f,
-					fill = false,
-				),
-			softWrap = true,
-		)
         Switch(
             modifier = modifier,
             enabled = enabled,

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

@@ -1,37 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.ui.common.dialog
-
-import androidx.compose.material3.AlertDialog
-import androidx.compose.material3.Text
-import androidx.compose.material3.TextButton
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.res.stringResource
-import com.zaneschepke.wireguardautotunnel.R
-
-@Composable
-fun InfoDialog(
-	onAttest: () -> Unit,
-	onDismiss: () -> Unit,
-	title: @Composable () -> Unit,
-	body: @Composable () -> Unit,
-	confirmText: @Composable () -> Unit,
-) {
-	AlertDialog(
-		onDismissRequest = { onDismiss() },
-		confirmButton = {
-			TextButton(
-				onClick = {
-					onAttest()
-				},
-			) {
-				confirmText()
-			}
-		},
-		dismissButton = {
-			TextButton(onClick = { onDismiss() }) {
-				Text(text = stringResource(R.string.cancel))
-			}
-		},
-		title = { title() },
-		text = { body() },
-	)
-}

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

@@ -6,34 +6,17 @@ import androidx.compose.material3.NavigationBar
 import androidx.compose.material3.NavigationBarItem
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.saveable.rememberSaveable
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.text.font.FontWeight
 import androidx.navigation.NavController
 import androidx.navigation.compose.currentBackStackEntryAsState
-import com.zaneschepke.wireguardautotunnel.ui.Screen
 
 @Composable
 fun BottomNavBar(navController: NavController, bottomNavItems: List<BottomNavItem>) {
     val backStackEntry = navController.currentBackStackEntryAsState()
 
-	var showBottomBar by rememberSaveable { mutableStateOf(true) }
-	val navBackStackEntry by navController.currentBackStackEntryAsState()
-
-	// TODO find a better way to hide nav bar
-	showBottomBar =
-		when (navBackStackEntry?.destination?.route) {
-			Screen.Lock.route -> false
-			else -> true
-		}
-
     NavigationBar(
-		containerColor = if (!showBottomBar) Color.Transparent else MaterialTheme.colorScheme.background,
+        containerColor = MaterialTheme.colorScheme.background,
     ) {
-		if (showBottomBar) {
         bottomNavItems.forEach { item ->
             val selected = item.route == backStackEntry.value?.destination?.route
 
@@ -56,4 +39,3 @@ fun BottomNavBar(navController: NavController, bottomNavItems: List<BottomNavIte
         }
     }
 }
-}

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

@@ -15,39 +15,32 @@ fun AuthorizationPrompt(onSuccess: () -> Unit, onFailure: () -> Unit, onError: (
     val context = LocalContext.current
     val biometricManager = BiometricManager.from(context)
     val bio = biometricManager.canAuthenticate(BIOMETRIC_WEAK or DEVICE_CREDENTIAL)
-	val isBiometricAvailable =
+    val isBiometricAvailable = remember {
-		remember {
         when (bio) {
             BiometricManager.BIOMETRIC_ERROR_HW_UNAVAILABLE -> {
                 onError("Biometrics not available")
                 false
             }
-
             BiometricManager.BIOMETRIC_ERROR_NONE_ENROLLED -> {
                 onError("Biometrics not created")
                 false
             }
-
             BiometricManager.BIOMETRIC_ERROR_NO_HARDWARE -> {
                 onError("Biometric hardware not found")
                 false
             }
-
             BiometricManager.BIOMETRIC_ERROR_SECURITY_UPDATE_REQUIRED -> {
                 onError("Biometric security update required")
                 false
             }
-
             BiometricManager.BIOMETRIC_ERROR_UNSUPPORTED -> {
                 onError("Biometrics not supported")
                 false
             }
-
             BiometricManager.BIOMETRIC_STATUS_UNKNOWN -> {
                 onError("Biometrics status unknown")
                 false
             }
-
             BiometricManager.BIOMETRIC_SUCCESS -> true
             else -> false
         }
@@ -72,7 +65,9 @@ fun AuthorizationPrompt(onSuccess: () -> Unit, onFailure: () -> Unit, onError: (
                         onFailure()
                     }
 
-					override fun onAuthenticationSucceeded(result: BiometricPrompt.AuthenticationResult) {
+                    override fun onAuthenticationSucceeded(
+                        result: BiometricPrompt.AuthenticationResult
+                    ) {
                         super.onAuthenticationSucceeded(result)
                         onSuccess()
                     }

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

@@ -19,18 +19,25 @@ import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalLayoutDirection
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.LayoutDirection
 import androidx.compose.ui.unit.dp
+import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.WireGuardAutoTunnel
 
 @Composable
-fun CustomSnackBar(message: String, isRtl: Boolean = true, containerColor: Color = MaterialTheme.colorScheme.surface) {
+fun CustomSnackBar(
+    message: String,
+    isRtl: Boolean = true,
+    containerColor: Color = MaterialTheme.colorScheme.surface
+) {
+    val context = LocalContext.current
     Snackbar(
         containerColor = containerColor,
         modifier =
-		Modifier
+            Modifier.fillMaxWidth(
-			.fillMaxWidth(
                     if (WireGuardAutoTunnel.isRunningOnAndroidTv()) 1 / 3f else 2 / 3f,
                 )
                 .padding(bottom = 100.dp),
@@ -40,17 +47,13 @@ fun CustomSnackBar(message: String, isRtl: Boolean = true, containerColor: Color
             LocalLayoutDirection provides if (isRtl) LayoutDirection.Rtl else LayoutDirection.Ltr,
         ) {
             Row(
-				modifier =
+                modifier = Modifier.width(IntrinsicSize.Max).height(IntrinsicSize.Min),
-				Modifier
-					.width(IntrinsicSize.Max)
-					.height(IntrinsicSize.Min),
                 verticalAlignment = Alignment.CenterVertically,
                 horizontalArrangement = Arrangement.Start,
             ) {
-				val icon = Icons.Rounded.Info
                 Icon(
-					icon,
+                    Icons.Rounded.Info,
-					contentDescription = icon.name,
+                    contentDescription = stringResource(R.string.info),
                     tint = Color.White,
                     modifier = Modifier.padding(end = 10.dp),
                 )

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

@@ -16,11 +16,7 @@ fun LoadingScreen() {
     Column(
         horizontalAlignment = Alignment.CenterHorizontally,
         verticalArrangement = Arrangement.Top,
-		modifier =
+        modifier = Modifier.fillMaxSize().focusable().padding(),
-		Modifier
-			.fillMaxSize()
-			.focusable()
-			.padding(),
     ) {
         Column(modifier = Modifier.padding(120.dp)) { CircularProgressIndicator() }
     }

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

@@ -1,26 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.ui.common.text
-
-import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.unit.dp
-
-@Composable
-fun LogTypeLabel(color: Color, content: @Composable () -> Unit) {
-	Box(
-		modifier =
-		Modifier
-			.size(20.dp)
-			.clip(RoundedCornerShape(2.dp))
-			.background(color),
-		contentAlignment = Alignment.Center,
-	) {
-		content()
-	}
-}

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

@@ -15,7 +15,7 @@ import androidx.compose.ui.unit.sp
 fun SectionTitle(title: String, padding: Dp) {
     Text(
         title,
-		textAlign = TextAlign.Start,
+        textAlign = TextAlign.Center,
         style = TextStyle(fontSize = 18.sp, fontWeight = FontWeight.ExtraBold),
         modifier = Modifier.padding(padding, bottom = 5.dp, top = 5.dp),
     )

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/models/InterfaceProxy.kt

@@ -0,0 +1,30 @@
+package com.zaneschepke.wireguardautotunnel.ui.models
+
+import com.wireguard.config.Interface
+
+data class InterfaceProxy(
+    var privateKey: String = "",
+    var publicKey: String = "",
+    var addresses: String = "",
+    var dnsServers: String = "",
+    var listenPort: String = "",
+    var mtu: String = ""
+) {
+    companion object {
+        fun from(i: Interface): InterfaceProxy {
+            return InterfaceProxy(
+                publicKey = i.keyPair.publicKey.toBase64().trim(),
+                privateKey = i.keyPair.privateKey.toBase64().trim(),
+                addresses = i.addresses.joinToString(", ").trim(),
+                dnsServers = i.dnsServers.joinToString(", ").replace("/", "").trim(),
+                listenPort =
+                    if (i.listenPort.isPresent) {
+                        i.listenPort.get().toString().trim()
+                    } else {
+                        ""
+                    },
+                mtu = if (i.mtu.isPresent) i.mtu.get().toString().trim() else "",
+            )
+        }
+    }
+}

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/models/PeerProxy.kt

@@ -0,0 +1,73 @@
+package com.zaneschepke.wireguardautotunnel.ui.models
+
+import com.wireguard.config.Peer
+
+data class PeerProxy(
+    var publicKey: String = "",
+    var preSharedKey: String = "",
+    var persistentKeepalive: String = "",
+    var endpoint: String = "",
+    var allowedIps: String = IPV4_WILDCARD.joinToString(", ").trim()
+) {
+    companion object {
+        fun from(peer: Peer): PeerProxy {
+            return PeerProxy(
+                publicKey = peer.publicKey.toBase64(),
+                preSharedKey =
+                    if (peer.preSharedKey.isPresent) {
+                        peer.preSharedKey.get().toBase64().trim()
+                    } else {
+                        ""
+                    },
+                persistentKeepalive =
+                    if (peer.persistentKeepalive.isPresent) {
+                        peer.persistentKeepalive.get().toString().trim()
+                    } else {
+                        ""
+                    },
+                endpoint =
+                    if (peer.endpoint.isPresent) {
+                        peer.endpoint.get().toString().trim()
+                    } else {
+                        ""
+                    },
+                allowedIps = peer.allowedIps.joinToString(", ").trim(),
+            )
+        }
+
+        val IPV4_PUBLIC_NETWORKS =
+            setOf(
+                "0.0.0.0/5",
+                "8.0.0.0/7",
+                "11.0.0.0/8",
+                "12.0.0.0/6",
+                "16.0.0.0/4",
+                "32.0.0.0/3",
+                "64.0.0.0/2",
+                "128.0.0.0/3",
+                "160.0.0.0/5",
+                "168.0.0.0/6",
+                "172.0.0.0/12",
+                "172.32.0.0/11",
+                "172.64.0.0/10",
+                "172.128.0.0/9",
+                "173.0.0.0/8",
+                "174.0.0.0/7",
+                "176.0.0.0/4",
+                "192.0.0.0/9",
+                "192.128.0.0/11",
+                "192.160.0.0/13",
+                "192.169.0.0/16",
+                "192.170.0.0/15",
+                "192.172.0.0/14",
+                "192.176.0.0/12",
+                "192.192.0.0/10",
+                "193.0.0.0/8",
+                "194.0.0.0/7",
+                "196.0.0.0/6",
+                "200.0.0.0/5",
+                "208.0.0.0/4",
+            )
+        val IPV4_WILDCARD = setOf("0.0.0.0/0")
+    }
+}