feat: improved imports

Added a feature where you can now add a commented "# Name = " property to QR code configs to import them with a name. If there is no name configured, app will use the first peer's host address as a name.

Improved imports so they no longer replace an existing config if that config has the same name. Instead, they will import with a (number) appended for config name duplicates.

Closes #68

Fixed a bug where the initial state of auto tunneling may not be correct and cause unexpected behavior.

Fixed a bug where Amnezia imports were not working when being imported as a zip.

Improved/refactored error handling.

.github/CODE_OF_CONDUCT.md

@@ -0,0 +1,22 @@
+# 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/workflows/issue-workflow.yml

@@ -0,0 +1,20 @@
+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/pre-release.yml

@@ -1,4 +1,3 @@
-# name of the workflow
 name: Android CI Tag Deployment (Pre-release)
 
 on:
@@ -14,10 +13,13 @@ jobs:
     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 }}
+      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
@@ -36,10 +38,16 @@ jobs:
         id: decode_keystore
         uses: timheuer/base64-to-file@v1.2
         with:
-          fileName: 'android_keystore.jks'
+          fileName: ${{ env.KEY_STORE_FILE }}
-          fileDir: ${{ github.workspace }}/app/keystore/
+          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
@@ -59,7 +67,7 @@ jobs:
           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.2.0
+        uses: actions/upload-artifact@v4.3.3
         with:
           name: wgtunnel
           path: ${{ steps.apk-path.outputs.path }}
@@ -69,7 +77,7 @@ jobs:
           name: wgtunnel
       - name: Create Release with Fastlane changelog notes
         id: create_release
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
@@ -80,6 +88,32 @@ jobs:
           draft: false
           prerelease: true
           files: ${{ github.workspace }}/${{ steps.apk-path.outputs.path }}
+
+      - name: Install apksigner
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y apksigner
+
+      - name: Get checksum
+        id: checksum
+        run: echo "checksum=$(apksigner verify -print-certs ${{ steps.apk-path.outputs.path }} | grep -Po "(?<=SHA-256 digest:) .*" | tr -d "[:blank:]")" >> $GITHUB_OUTPUT
+
+      - name: Append checksum
+        id: append_checksum
+        uses: softprops/action-gh-release@v2
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          body: |
+            
+            SHA256 fingerprint:
+            ```${{ steps.checksum.outputs.checksum }}```
+          tag_name: ${{ github.ref_name }}
+          name: ${{ github.ref_name }}
+          draft: false
+          prerelease: true
+          append_body: true
+
       - name: Deploy with fastlane
         uses: ruby/setup-ruby@v1
         with:

.github/workflows/publish-workflow.yml

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

@@ -15,10 +15,13 @@ jobs:
     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 }}
+      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
@@ -37,10 +40,16 @@ jobs:
         id: decode_keystore
         uses: timheuer/base64-to-file@v1.2
         with:
-          fileName: 'android_keystore.jks'
+          fileName: ${{ env.KEY_STORE_FILE }}
-          fileDir: ${{ github.workspace }}/app/keystore/
+          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
@@ -60,7 +69,7 @@ jobs:
           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.2.0
+        uses: actions/upload-artifact@v4.3.3
         with:
           name: wgtunnel
           path: ${{ steps.apk-path.outputs.path }}
@@ -69,29 +78,54 @@ jobs:
         with:
           name: wgtunnel
       - name: Repository Dispatch for my F-Droid repo
-        uses: peter-evans/repository-dispatch@v2
+        uses: peter-evans/repository-dispatch@v3
         with:
           token: ${{ secrets.PAT }}
           repository: zaneschepke/fdroid
           event-type: fdroid-update
       - name: Create Release with Fastlane changelog notes
         id: create_release
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          # fix hardcode changelog file name
           body_path: ${{ github.workspace }}/fastlane/metadata/android/en-US/changelogs/${{ env.VERSION_CODE }}.txt
           tag_name: ${{ github.ref_name }}
           name: ${{ github.ref_name }}
           draft: false
           prerelease: false
           files: ${{ github.workspace }}/${{ steps.apk-path.outputs.path }}
+
+      - name: Install apksigner
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y apksigner
+
+      - name: Get checksum
+        id: checksum
+        run: echo "checksum=$(apksigner verify -print-certs ${{ steps.apk-path.outputs.path }} | grep -Po "(?<=SHA-256 digest:) .*" | tr -d "[:blank:]")" >> $GITHUB_OUTPUT
+
+      - name: Append checksum
+        id: append_checksum
+        uses: softprops/action-gh-release@v2
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          body: |
+            
+            SHA256 fingerprint:
+            ```${{ steps.checksum.outputs.checksum }}```
+          tag_name: ${{ github.ref_name }}
+          name: ${{ github.ref_name }}
+          draft: false
+          prerelease: false
+          append_body: true
+
       - 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 🚀
+      - name: Distribute app to Prod track 🚀
         run: (cd ${{ github.workspace }} && bundle install && bundle exec fastlane production)
 

README.md

@@ -4,8 +4,9 @@ WG Tunnel
 
 <div align="center">
 
-[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
+[![Discord](https://img.shields.io/badge/Discord-%235865F2.svg?style=for-the-badge&logo=discord&logoColor=white)](https://discord.gg/rbRRNh6H7V)
-[![Discord Chat](https://img.shields.io/discord/1108285024631001111.svg)](https://discord.gg/rbRRNh6H7V)
+[![X Community](https://img.shields.io/badge/X-000000?style=for-the-badge&logo=x&logoColor=white)](https://twitter.com/i/communities/1780655267685736818)
+[![Telegram](https://img.shields.io/badge/Telegram-2CA5E0?style=for-the-badge&logo=telegram&logoColor=white)](https://t.me/wgtunnel)
 
 </div>
 
@@ -13,7 +14,6 @@ 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/)
 
 
@@ -22,7 +22,7 @@ WG Tunnel
 
 <div align="left">
 
-This is an alternative Android Application for [WireGuard](https://www.wireguard.com/) with added
+This is an alternative Android Application for [WireGuard](https://www.wireguard.com/) 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.
@@ -50,28 +50,51 @@ 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 VPN based on Wi-Fi SSID, ethernet, or mobile data
+* Auto connect to tunnels 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 tunnels to zip
+* Export Amnezia and WireGuard tunnels to zip
-* Quick tile support for VPN toggling
+* Quick tile support for tunnel toggling, auto-tunneling
-* Static shortcuts support for primary tunnel for automation integration
+* Static shortcuts support for tunnel toggling, auto-tunneling
 * Intent automation support for all tunnels
-* Automatic service restart after reboot
+* Automatic auto-tunneling service restart after reboot
+* Automatic tunnel restart after reboot
 * Battery preservation measures
+* Restart tunnel on ping failure (beta)
 
-## Docs (WIP)
+## Docs
 
-Basic documentation of the feature and behaviors of this app can be found [here](https://zaneschepke.com/wgtunnel-docs/overview.html).
+Basic documentation of the feature and behaviors of this app can be
+found [here](https://zaneschepke.com/wgtunnel-docs/overview.html).
 
 The repository for these docs can be found [here](https://github.com/zaneschepke/wgtunnel-docs).
 
+## Contributing
+
+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.
+
+## 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
 ```
 

SECURITY.md

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

app/build.gradle.kts

@@ -4,7 +4,7 @@ plugins {
     alias(libs.plugins.android.application)
     alias(libs.plugins.kotlin.android)
     alias(libs.plugins.hilt.android)
-    id("org.jetbrains.kotlin.plugin.serialization")
+    alias(libs.plugins.kotlinxSerialization)
     alias(libs.plugins.ksp)
 }
 
@@ -12,6 +12,10 @@ android {
     namespace = Constants.APP_ID
     compileSdk = Constants.TARGET_SDK
 
+    androidResources {
+        generateLocaleConfig = true
+    }
+
     defaultConfig {
         applicationId = Constants.APP_ID
         minSdk = Constants.MIN_SDK
@@ -25,8 +29,6 @@ android {
             getByName("debug").assets.srcDirs(files("$projectDir/schemas")) // Room
         }
 
-        resourceConfigurations.addAll(listOf("en"))
-
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables { useSupportLibrary = true }
     }
@@ -111,8 +113,7 @@ android {
         create("general") {
             dimension = Constants.TYPE
             if (BuildHelper.isReleaseBuild(gradle) && BuildHelper.isGeneralFlavor(gradle)) {
-                apply(plugin = "com.google.gms.google-services")
+                //any plugins general specific
-                apply(plugin = "com.google.firebase.crashlytics")
             }
         }
     }
@@ -133,9 +134,13 @@ android {
 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))
@@ -156,23 +161,26 @@ dependencies {
     debugImplementation(libs.androidx.compose.ui.tooling)
     debugImplementation(libs.androidx.compose.manifest)
 
-    // wg
+    // get tunnel lib from github packages or mavenLocal
     implementation(libs.tunnel)
+    implementation(libs.amneziawg.android)
     coreLibraryDesugaring(libs.desugar.jdk.libs)
 
     // logging
     implementation(libs.timber)
 
+
     // compose navigation
     implementation(libs.androidx.navigation.compose)
     implementation(libs.androidx.hilt.navigation.compose)
 
+    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)
@@ -193,17 +201,13 @@ 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)

app/google-services.json

@@ -1,39 +0,0 @@
-{
-  "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/schemas/com.zaneschepke.wireguardautotunnel.data.AppDatabase/6.json

@@ -0,0 +1,168 @@
+{
+  "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

@@ -0,0 +1,176 @@
+{
+  "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

@@ -0,0 +1,190 @@
+{
+  "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,6 +4,7 @@ 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
@@ -22,39 +23,13 @@ class MigrationTest {
 
     @Test
     @Throws(IOException::class)
-    fun migrate4To5() {
+    fun migrate6To7() {
-        helper.createDatabase(dbName, 4).apply {
+        helper.createDatabase(dbName, 6).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(
-                "INSERT INTO Settings (is_tunnel_enabled," +
+                Queries.createTunnelConfig(),
-                    "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()
@@ -62,7 +37,7 @@ class MigrationTest {
 
         // Re-open the database with version 2 and provide
         // MIGRATION_1_2 as the migration process.
-        helper.runMigrationsAndValidate(dbName, 5, true)
+        helper.runMigrationsAndValidate(dbName, 7, true)
         // MigrationTestHelper automatically verifies the schema changes,
         // but you need to validate that the data was migrated properly.
     }

app/src/main/AndroidManifest.xml

@@ -23,7 +23,6 @@
     <!--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" />
@@ -53,7 +52,7 @@
     <application
         android:name=".WireGuardAutoTunnel"
         android:allowBackup="true"
-        android:banner="@mipmap/ic_banner"
+        android:banner="@drawable/ic_banner"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:enableOnBackInvokedCallback="true"
         android:fullBackupContent="@xml/backup_rules"
@@ -84,7 +83,8 @@
             android:screenOrientation="fullSensor"
             android:stateNotNeeded="true"
             android:theme="@style/zxing_CaptureTheme"
-            android:windowSoftInputMode="stateAlwaysHidden" />
+            android:windowSoftInputMode="stateAlwaysHidden"
+            tools:ignore="DiscouragedApi" />
         <activity
             android:name=".service.shortcut.ShortcutsActivity"
             android:enabled="true"
@@ -96,13 +96,30 @@
             android:name=".service.foreground.ForegroundService"
             android:enabled="true"
             android:exported="false"
-            android:foregroundServiceType="systemExempted|specialUse"
+            android:foregroundServiceType="systemExempted"
             tools:node="merge" />
         <service
             android:name=".service.tile.TunnelControlTile"
             android:exported="true"
-            android:icon="@drawable/shield"
+            android:icon="@drawable/ic_launcher"
-            android:label="WG Tunnel"
+            android:label="Tunnel control"
+            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"
@@ -119,7 +136,7 @@
             android:name=".service.foreground.WireGuardTunnelService"
             android:enabled="true"
             android:exported="false"
-            android:foregroundServiceType="systemExempted|specialUse"
+            android:foregroundServiceType="systemExempted"
             android:permission="android.permission.BIND_VPN_SERVICE"
             android:persistent="true"
             tools:node="merge">
@@ -134,7 +151,7 @@
             android:name=".service.foreground.WireGuardConnectivityWatcherService"
             android:enabled="true"
             android:exported="false"
-            android:foregroundServiceType="systemExempted|specialUse"
+            android:foregroundServiceType="systemExempted"
             android:persistent="true"
             android:stopWithTask="false"
             tools:node="merge" />

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

@@ -4,19 +4,34 @@ import android.app.Application
 import android.content.ComponentName
 import android.content.pm.PackageManager
 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 kotlinx.coroutines.MainScope
+import kotlinx.coroutines.cancel
 import timber.log.Timber
+import xyz.teamgravity.pin_lock_compose.PinManager
 
 @HiltAndroidApp
 class WireGuardAutoTunnel : Application() {
     override fun onCreate() {
         super.onCreate()
         instance = this
-        if (BuildConfig.DEBUG) Timber.plant(Timber.DebugTree())
+        if (BuildConfig.DEBUG) Timber.plant(Timber.DebugTree()) else Timber.plant(ReleaseTree())
+        PinManager.initialize(this)
+    }
+
+    override fun onLowMemory() {
+        super.onLowMemory()
+        applicationScope.cancel("onLowMemory() called by system")
+        applicationScope = MainScope()
     }
 
     companion object {
+
+        var applicationScope = MainScope()
+
         lateinit var instance: WireGuardAutoTunnel
             private set
 
@@ -24,11 +39,18 @@ class WireGuardAutoTunnel : Application() {
             return instance.packageManager.hasSystemFeature(PackageManager.FEATURE_LEANBACK)
         }
 
-        fun requestTileServiceStateUpdate() {
+        fun requestTunnelTileServiceStateUpdate() {
             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,14 +2,16 @@ 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 com.zaneschepke.wireguardautotunnel.data.model.Settings
+import androidx.room.migration.AutoMigrationSpec
-import com.zaneschepke.wireguardautotunnel.data.model.TunnelConfig
+import com.zaneschepke.wireguardautotunnel.data.domain.Settings
+import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
 
 @Database(
     entities = [Settings::class, TunnelConfig::class],
-    version = 5,
+    version = 8,
     autoMigrations =
     [
         AutoMigration(from = 1, to = 2),
@@ -22,6 +24,16 @@ import com.zaneschepke.wireguardautotunnel.data.model.TunnelConfig
             from = 4,
             to = 5,
         ),
+        AutoMigration(
+            from = 5,
+            to = 6,
+        ),
+        AutoMigration(
+            from = 6,
+            to = 7,
+            spec = RemoveLegacySettingColumnsMigration::class,
+        ),
+        AutoMigration(7, 8)
     ],
     exportSchema = true,
 )
@@ -31,3 +43,13 @@ 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

@@ -0,0 +1,21 @@
+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.isEmpty()) return mutableListOf()
+        if (value.isBlank() || value.isEmpty()) return mutableListOf()
         return try {
             Json.decodeFromString<MutableList<String>>(value)
         } catch (e: Exception) {

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

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

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

@@ -5,22 +5,48 @@ import androidx.room.Delete
 import androidx.room.Insert
 import androidx.room.OnConflictStrategy
 import androidx.room.Query
-import com.zaneschepke.wireguardautotunnel.data.model.TunnelConfig
+import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
+import com.zaneschepke.wireguardautotunnel.util.TunnelConfigs
 import kotlinx.coroutines.flow.Flow
 
 @Dao
 interface TunnelConfigDao {
-    @Insert(onConflict = OnConflictStrategy.REPLACE) suspend fun save(t: TunnelConfig)
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun save(t: TunnelConfig)
 
-    @Insert(onConflict = OnConflictStrategy.REPLACE) suspend fun saveAll(t: List<TunnelConfig>)
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun saveAll(t: TunnelConfigs)
 
-    @Query("SELECT * FROM TunnelConfig WHERE id=:id") suspend fun getById(id: Long): TunnelConfig?
+    @Query("SELECT * FROM TunnelConfig WHERE id=:id")
+    suspend fun getById(id: Long): TunnelConfig?
 
-    @Query("SELECT * FROM TunnelConfig") suspend fun getAll(): List<TunnelConfig>
+    @Query("SELECT * FROM TunnelConfig WHERE name=:name")
+    suspend fun getByName(name: String) : TunnelConfig?
 
-    @Delete suspend fun delete(t: TunnelConfig)
+    @Query("SELECT * FROM TunnelConfig")
+    suspend fun getAll(): TunnelConfigs
 
-    @Query("SELECT COUNT('id') FROM TunnelConfig") suspend fun count(): Long
+    @Delete
+    suspend fun delete(t: TunnelConfig)
 
-    @Query("SELECT * FROM tunnelconfig") fun getAllFlow(): Flow<MutableList<TunnelConfig>>
+    @Query("SELECT COUNT('id') FROM TunnelConfig")
+    suspend fun count(): Long
+
+    @Query("SELECT * FROM TunnelConfig WHERE tunnel_networks LIKE '%' || :name || '%'")
+    suspend fun findByTunnelNetworkName(name: String): TunnelConfigs
+
+    @Query("UPDATE TunnelConfig SET is_primary_tunnel = 0 WHERE is_primary_tunnel =1")
+    fun resetPrimaryTunnel()
+
+    @Query("UPDATE TunnelConfig SET is_mobile_data_tunnel = 0 WHERE is_mobile_data_tunnel =1")
+    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,15 +4,24 @@ 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 kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.runBlocking
+import timber.log.Timber
+import java.io.IOException
 
 class DataStoreManager(private val context: Context) {
     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")
     }
 
     // preferences
@@ -23,16 +32,39 @@ class DataStoreManager(private val context: Context) {
     )
 
     suspend fun init() {
+        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) {
+        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>) =
+    suspend fun <T> getFromStore(key: Preferences.Key<T>): T? {
-        context.dataStore.data.first { it.contains(key) }[key]
+        return 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

@@ -0,0 +1,14 @@
+package com.zaneschepke.wireguardautotunnel.data.domain
+
+data class GeneralState(
+    val locationDisclosureShown: Boolean = LOCATION_DISCLOSURE_SHOWN_DEFAULT,
+    val batteryOptimizationDisableShown: Boolean = BATTERY_OPTIMIZATION_DISABLE_SHOWN_DEFAULT,
+    val tunnelRunningFromManualStart: Boolean = TUNNELING_RUNNING_FROM_MANUAL_START_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
+    }
+}

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

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

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

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

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

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

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

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

@@ -0,0 +1,81 @@
+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 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(
+                        locationDisclosureShown = pref[DataStoreManager.LOCATION_DISCLOSURE_SHOWN]
+                            ?: GeneralState.LOCATION_DISCLOSURE_SHOWN_DEFAULT,
+                        batteryOptimizationDisableShown = pref[DataStoreManager.BATTERY_OPTIMIZE_DISABLE_SHOWN]
+                            ?: GeneralState.BATTERY_OPTIMIZATION_DISABLE_SHOWN_DEFAULT,
+                        tunnelRunningFromManualStart = pref[DataStoreManager.TUNNEL_RUNNING_FROM_MANUAL_START]
+                            ?: 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,10 +1,10 @@
 package com.zaneschepke.wireguardautotunnel.data.repository
 
 import com.zaneschepke.wireguardautotunnel.data.SettingsDao
-import com.zaneschepke.wireguardautotunnel.data.model.Settings
+import com.zaneschepke.wireguardautotunnel.data.domain.Settings
 import kotlinx.coroutines.flow.Flow
 
-class SettingsRepositoryImpl(private val settingsDoa: SettingsDao) : SettingsRepository {
+class RoomSettingsRepository(private val settingsDoa: SettingsDao) : SettingsRepository {
 
     override suspend fun save(settings: Settings) {
         settingsDoa.save(settings)

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

@@ -0,0 +1,72 @@
+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.model.Settings
+import com.zaneschepke.wireguardautotunnel.data.domain.Settings
 import kotlinx.coroutines.flow.Flow
 
 interface SettingsRepository {

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

@@ -1,6 +1,6 @@
 package com.zaneschepke.wireguardautotunnel.data.repository
 
-import com.zaneschepke.wireguardautotunnel.data.model.TunnelConfig
+import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
 import com.zaneschepke.wireguardautotunnel.util.TunnelConfigs
 import kotlinx.coroutines.flow.Flow
 
@@ -12,7 +12,21 @@ interface TunnelConfigRepository {
 
     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

@@ -1,29 +0,0 @@
-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/DatabaseModule.kt

@@ -4,6 +4,7 @@ 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 dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
@@ -23,6 +24,7 @@ class DatabaseModule {
             context.getString(R.string.db_name),
         )
             .fallbackToDestructiveMigration()
+            .addCallback(DatabaseCallback())
             .build()
     }
 }

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

@@ -2,4 +2,6 @@ package com.zaneschepke.wireguardautotunnel.module
 
 import javax.inject.Qualifier
 
-@Qualifier @Retention(AnnotationRetention.BINARY) annotation class Kernel
+@Qualifier
+@Retention(AnnotationRetention.BINARY)
+annotation class Kernel

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

@@ -5,10 +5,14 @@ import com.zaneschepke.wireguardautotunnel.data.AppDatabase
 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
@@ -34,13 +38,13 @@ class RepositoryModule {
     @Singleton
     @Provides
     fun provideTunnelConfigRepository(tunnelConfigDao: TunnelConfigDao): TunnelConfigRepository {
-        return TunnelConfigRepositoryImpl(tunnelConfigDao)
+        return RoomTunnelConfigRepository(tunnelConfigDao)
     }
 
     @Singleton
     @Provides
     fun provideSettingsRepository(settingsDao: SettingsDao): SettingsRepository {
-        return SettingsRepositoryImpl(settingsDao)
+        return RoomSettingsRepository(settingsDao)
     }
 
     @Singleton
@@ -48,4 +52,22 @@ class RepositoryModule {
     fun providePreferencesDataStore(@ApplicationContext context: Context): DataStoreManager {
         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/TunnelModule.kt

@@ -6,7 +6,8 @@ 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.SettingsRepository
+import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
+import com.zaneschepke.wireguardautotunnel.service.foreground.ServiceManager
 import com.zaneschepke.wireguardautotunnel.service.tunnel.VpnService
 import com.zaneschepke.wireguardautotunnel.service.tunnel.WireGuardTunnel
 import dagger.Module
@@ -39,13 +40,26 @@ 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: org.amnezia.awg.backend.Backend,
         @Userspace userspaceBackend: Backend,
         @Kernel kernelBackend: Backend,
-        settingsRepository: SettingsRepository
+        appDataRepository: AppDataRepository
     ): VpnService {
-        return WireGuardTunnel(userspaceBackend, kernelBackend, settingsRepository)
+        return WireGuardTunnel(amneziaBackend,userspaceBackend, kernelBackend, appDataRepository)
+    }
+
+    @Provides
+    @Singleton
+    fun provideServiceManager(appDataRepository: AppDataRepository): ServiceManager {
+        return ServiceManager(appDataRepository)
     }
 }

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

@@ -2,4 +2,6 @@ package com.zaneschepke.wireguardautotunnel.module
 
 import javax.inject.Qualifier
 
-@Qualifier @Retention(AnnotationRetention.BINARY) annotation class Userspace
+@Qualifier
+@Retention(AnnotationRetention.BINARY)
+annotation class Userspace

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

@@ -3,21 +3,43 @@ package com.zaneschepke.wireguardautotunnel.receiver
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
-import com.zaneschepke.wireguardautotunnel.data.repository.SettingsRepository
+import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
 import com.zaneschepke.wireguardautotunnel.service.foreground.ServiceManager
 import com.zaneschepke.wireguardautotunnel.util.goAsync
 import dagger.hilt.android.AndroidEntryPoint
+import timber.log.Timber
 import javax.inject.Inject
 
 @AndroidEntryPoint
 class BootReceiver : BroadcastReceiver() {
 
-    @Inject lateinit var settingsRepository: SettingsRepository
+    @Inject
+    lateinit var appDataRepository: AppDataRepository
+
+    @Inject
+    lateinit var serviceManager: ServiceManager
 
     override fun onReceive(context: Context?, intent: Intent?) = goAsync {
         if (Intent.ACTION_BOOT_COMPLETED != intent?.action) return@goAsync
-        if (settingsRepository.getSettings().isAutoTunnelEnabled) {
+        context?.run {
-            ServiceManager.startWatcherServiceForeground(context!!)
+            val settings = appDataRepository.settings.getSettings()
+            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,
+                    )
+                }
+            }
+            if (settings.isAlwaysOnVpnEnabled) {
+                Timber.i("Starting vpn service from boot AOVPN")
+                serviceManager.startVpnServiceForeground(context)
+            }
         }
     }
 }

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

@@ -10,20 +10,25 @@ import com.zaneschepke.wireguardautotunnel.util.goAsync
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.delay
+import timber.log.Timber
 import javax.inject.Inject
 
 @AndroidEntryPoint
 class NotificationActionReceiver : BroadcastReceiver() {
-    @Inject lateinit var settingsRepository: SettingsRepository
+    @Inject
+    lateinit var settingsRepository: SettingsRepository
+
+    @Inject
+    lateinit var serviceManager: ServiceManager
 
     override fun onReceive(context: Context, intent: Intent?) = goAsync {
         try {
-            val settings = settingsRepository.getSettings()
+            //TODO fix for manual start changes when enabled
-            if (settings.defaultTunnel != null) {
+            serviceManager.stopVpnServiceForeground(context)
-                ServiceManager.stopVpnService(context)
             delay(Constants.TOGGLE_TUNNEL_DELAY)
-                ServiceManager.startVpnServiceForeground(context, settings.defaultTunnel.toString())
+            serviceManager.startVpnServiceForeground(context)
-            }
+        } catch (e: Exception) {
+            Timber.e(e)
         } finally {
             cancel()
         }

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

@@ -3,5 +3,6 @@ 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,6 +4,7 @@ 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,11 +24,12 @@ open class ForegroundService : LifecycleService() {
             when (action) {
                 Action.START.name,
                 Action.START_FOREGROUND.name -> startService(intent.extras)
-                Action.STOP.name -> stopService(intent.extras)
+                Action.STOP.name, Action.STOP_FOREGROUND.name -> stopService()
-                "android.net.VpnService" -> {
+                Constants.ALWAYS_ON_VPN_ACTION -> {
-                    Timber.d("Always-on VPN starting service")
+                    Timber.i("Always-on VPN starting service")
                     startService(intent.extras)
                 }
+
                 else -> Timber.d("This should never happen. No action in the received intent")
             }
         } else {
@@ -35,29 +37,19 @@ 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(extras: Bundle?) {
+    protected open fun stopService() {
         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,31 +3,17 @@ package com.zaneschepke.wireguardautotunnel.service.foreground
 import android.app.Service
 import android.content.Context
 import android.content.Intent
-import com.zaneschepke.wireguardautotunnel.R
+import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
+import com.zaneschepke.wireguardautotunnel.util.Constants
 import timber.log.Timber
 
-object ServiceManager {
+class ServiceManager(private val appDataRepository: AppDataRepository) {
-
-    //    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
+        extras: Map<String, Int>? = null
     ) {
         val intent =
             Intent(context, cls).also {
@@ -37,30 +23,41 @@ object ServiceManager {
         intent.component?.javaClass
         try {
             when (action) {
-                Action.START_FOREGROUND -> {
+                Action.START_FOREGROUND, Action.STOP_FOREGROUND -> context.startForegroundService(intent)
-                    context.startForegroundService(intent)
+                Action.START, Action.STOP -> context.startService(intent)
-                }
-                Action.START -> {
-                    context.startService(intent)
-                }
-                Action.STOP -> context.startService(intent)
             }
         } catch (e: Exception) {
             Timber.e(e.message)
         }
     }
 
-    fun startVpnService(context: Context, tunnelConfig: String) {
+    suspend fun startVpnService(
+        context: Context,
+        tunnelId: Int? = null,
+        isManualStart: Boolean = false
+    ) {
+        if (isManualStart) onManualStart(tunnelId)
         actionOnService(
             Action.START,
             context,
             WireGuardTunnelService::class.java,
-            mapOf(context.getString(R.string.tunnel_extras_key) to tunnelConfig),
+            tunnelId?.let { mapOf(Constants.TUNNEL_EXTRA_KEY to it) },
         )
     }
 
-    fun stopVpnService(context: Context) {
+    suspend fun stopVpnServiceForeground(context: Context, isManualStop: Boolean = false) {
-        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) {
+        if (isManualStop) onManualStop()
+        Timber.i("Stopping vpn service")
         actionOnService(
             Action.STOP,
             context,
@@ -68,12 +65,27 @@ object ServiceManager {
         )
     }
 
-    fun startVpnServiceForeground(context: Context, tunnelConfig: String) {
+    private suspend fun onManualStop() {
+        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
+    ) {
+        if (isManualStart) onManualStart(tunnelId)
         actionOnService(
             Action.START_FOREGROUND,
             context,
             WireGuardTunnelService::class.java,
-            mapOf(context.getString(R.string.tunnel_extras_key) to tunnelConfig),
+            tunnelId?.let { mapOf(Constants.TUNNEL_EXTRA_KEY to it) },
         )
     }
 

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

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

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

@@ -0,0 +1,63 @@
+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 isTunnelOnMobileDataPreferredConditionMet(): 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,65 +1,64 @@
 package com.zaneschepke.wireguardautotunnel.service.foreground
 
-import android.app.AlarmManager
-import android.app.PendingIntent
 import android.content.Context
-import android.content.Intent
 import android.os.Bundle
 import android.os.PowerManager
-import android.os.SystemClock
 import androidx.core.app.ServiceCompat
 import androidx.lifecycle.lifecycleScope
-import com.wireguard.android.backend.Tunnel
 import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.data.model.Settings
+import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
-import com.zaneschepke.wireguardautotunnel.data.repository.SettingsRepository
+import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
 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.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 lateinit var wifiService: NetworkService<WifiService>
+    @Inject
+    lateinit var wifiService: NetworkService<WifiService>
 
-    @Inject lateinit var mobileDataService: NetworkService<MobileDataService>
+    @Inject
+    lateinit var mobileDataService: NetworkService<MobileDataService>
 
-    @Inject lateinit var ethernetService: NetworkService<EthernetService>
+    @Inject
+    lateinit var ethernetService: NetworkService<EthernetService>
 
-    @Inject lateinit var settingsRepository: SettingsRepository
+    @Inject
+    lateinit var appDataRepository: AppDataRepository
 
-    @Inject lateinit var notificationService: NotificationService
+    @Inject
+    lateinit var notificationService: NotificationService
 
-    @Inject lateinit var vpnService: VpnService
+    @Inject
+    lateinit var vpnService: VpnService
+
+    @Inject
+    lateinit var serviceManager: ServiceManager
 
     private val networkEventsFlow = MutableStateFlow(WatcherState())
 
-    data class WatcherState(
+    private var watcherJob: Job? = null
-        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
@@ -68,7 +67,7 @@ class WireGuardConnectivityWatcherService : ForegroundService() {
         super.onCreate()
         lifecycleScope.launch(Dispatchers.Main) {
             try {
-                if (settingsRepository.getSettings().isAutoTunnelPaused) {
+                if (appDataRepository.settings.getSettings().isAutoTunnelPaused) {
                     launchWatcherPausedNotification()
                 } else launchWatcherNotification()
             } catch (e: Exception) {
@@ -89,8 +88,8 @@ class WireGuardConnectivityWatcherService : ForegroundService() {
         }
     }
 
-    override fun stopService(extras: Bundle?) {
+    override fun stopService() {
-        super.stopService(extras)
+        super.stopService()
         wakeLock?.let {
             if (it.isHeld) {
                 it.release()
@@ -122,270 +121,306 @@ class WireGuardConnectivityWatcherService : ForegroundService() {
         launchWatcherNotification(getString(R.string.watcher_notification_text_paused))
     }
 
-    // TODO could this be restarting service in a bad state?
+    private fun initWakeLock() {
-    // try to start task again if killed
-    override fun onTaskRemoved(rootIntent: Intent) {
-        Timber.d("Task Removed called")
-        val restartServiceIntent = Intent(rootIntent)
-        val restartServicePendingIntent: PendingIntent =
-            PendingIntent.getService(
-                this,
-                1,
-                restartServiceIntent,
-                PendingIntent.FLAG_ONE_SHOT or PendingIntent.FLAG_IMMUTABLE,
-            )
-        applicationContext.getSystemService(Context.ALARM_SERVICE)
-        val alarmService: AlarmManager =
-            applicationContext.getSystemService(Context.ALARM_SERVICE) as AlarmManager
-        alarmService.set(
-            AlarmManager.ELAPSED_REALTIME,
-            SystemClock.elapsedRealtime() + 1000,
-            restartServicePendingIntent,
-        )
-    }
-
-    private suspend fun initWakeLock() {
-        val isBatterySaverOn =
-            withContext(lifecycleScope.coroutineContext) {
-                settingsRepository.getSettings().isBatterySaverEnabled
-            }
         wakeLock =
             (getSystemService(Context.POWER_SERVICE) as PowerManager).run {
                 newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "$tag::lock").apply {
-                    if (isBatterySaverOn) {
+                    try {
-                        Timber.d("Initiating wakelock with timeout")
+                        Timber.i("Initiating wakelock with 10 min timeout")
                         acquire(Constants.BATTERY_SAVER_WATCHER_WAKE_LOCK_TIMEOUT)
-                    } else {
+                    } finally {
-                        Timber.d("Initiating wakelock with zero timeout")
+                        release()
-                        acquire(Constants.DEFAULT_WATCHER_WAKE_LOCK_TIMEOUT)
                     }
                 }
             }
     }
 
     private fun cancelWatcherJob() {
-        if (this::watcherJob.isInitialized) {
+        try {
-            watcherJob.cancel()
+            watcherJob?.cancel()
+        } catch (e : CancellationException) {
+            Timber.i("Watcher job cancelled")
         }
     }
 
     private fun startWatcherJob() {
         watcherJob =
             lifecycleScope.launch(Dispatchers.IO) {
-                val setting = settingsRepository.getSettings()
+                val setting = appDataRepository.settings.getSettings()
                 launch {
-                    Timber.d("Starting wifi watcher")
+                    Timber.i("Starting wifi watcher")
                     watchForWifiConnectivityChanges()
                 }
                 if (setting.isTunnelOnMobileDataEnabled) {
                     launch {
-                        Timber.d("Starting mobile data watcher")
+                        Timber.i("Starting mobile data watcher")
                         watchForMobileDataConnectivityChanges()
                     }
                 }
                 if (setting.isTunnelOnEthernetEnabled) {
                     launch {
-                        Timber.d("Starting ethernet data watcher")
+                        Timber.i("Starting ethernet data watcher")
                         watchForEthernetConnectivityChanges()
                     }
                 }
                 launch {
-                    Timber.d("Starting vpn state watcher")
+                    Timber.i("Starting settings watcher")
-                    watchForVpnConnectivityChanges()
-                }
-                launch {
-                    Timber.d("Starting settings watcher")
                     watchForSettingsChanges()
                 }
+                if (setting.isPingEnabled) {
                     launch {
-                    Timber.d("Starting management watcher")
+                        Timber.i("Starting ping watcher")
+                        watchForPingFailure()
+                    }
+                }
+                launch {
+                    Timber.i("Starting management watcher")
                     manageVpn()
                 }
+
             }
     }
 
     private suspend fun watchForMobileDataConnectivityChanges() {
-        mobileDataService.networkStatus.collect {
+        mobileDataService.networkStatus.collect { status ->
-            when (it) {
+            when (status) {
                 is NetworkStatus.Available -> {
-                    Timber.d("Gained Mobile data connection")
+                    Timber.i("Gained Mobile data connection")
-                    networkEventsFlow.value =
+                    networkEventsFlow.update {
-                        networkEventsFlow.value.copy(
+                        it.copy(
                             isMobileDataConnected = true,
                         )
                     }
+                }
+
                 is NetworkStatus.CapabilitiesChanged -> {
-                    networkEventsFlow.value =
+                    networkEventsFlow.update {
-                        networkEventsFlow.value.copy(
+                        it.copy(
                             isMobileDataConnected = true,
                         )
-                    Timber.d("Mobile data capabilities changed")
                     }
+                    Timber.i("Mobile data capabilities changed")
+                }
+
                 is NetworkStatus.Unavailable -> {
-                    networkEventsFlow.value =
+                    networkEventsFlow.update {
-                        networkEventsFlow.value.copy(
+                        it.copy(
                             isMobileDataConnected = false,
                         )
-                    Timber.d("Lost mobile data connection")
+                    }
+                    Timber.i("Lost mobile data connection")
                 }
             }
         }
     }
 
+    private suspend fun watchForPingFailure() {
+        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(this)
+                            delay(Constants.VPN_RESTART_DELAY)
+                            serviceManager.startVpnServiceForeground(this, it.id)
+                            delay(Constants.PING_COOLDOWN)
+                        }
+                    }
+                }
+                delay(Constants.PING_INTERVAL)
+            } while (true)
+        } catch (e: Exception) {
+            Timber.e(e)
+        }
+    }
+
     private suspend fun watchForSettingsChanges() {
-        settingsRepository.getSettingsFlow().collect {
+        appDataRepository.settings.getSettingsFlow().collect { settings ->
-            if (networkEventsFlow.value.settings.isAutoTunnelPaused != it.isAutoTunnelPaused) {
+            if (networkEventsFlow.value.settings.isAutoTunnelPaused != settings.isAutoTunnelPaused) {
-                when (it.isAutoTunnelPaused) {
+                when (settings.isAutoTunnelPaused) {
                     true -> launchWatcherPausedNotification()
                     false -> launchWatcherNotification()
                 }
             }
-            networkEventsFlow.value =
+            networkEventsFlow.update {
-                networkEventsFlow.value.copy(
+                it.copy(
-                    settings = it,
+                    settings = settings,
                 )
             }
         }
-
-    private suspend fun watchForVpnConnectivityChanges() {
-        vpnService.vpnState.collect {
-            when (it.status) {
-                Tunnel.State.DOWN ->
-                    networkEventsFlow.value =
-                        networkEventsFlow.value.copy(
-                            isVpnConnected = false,
-                        )
-                Tunnel.State.UP ->
-                    networkEventsFlow.value =
-                        networkEventsFlow.value.copy(
-                            isVpnConnected = true,
-                        )
-                else -> {}
-            }
-        }
     }
 
     private suspend fun watchForEthernetConnectivityChanges() {
-        ethernetService.networkStatus.collect {
+        ethernetService.networkStatus.collect { status ->
-            when (it) {
+            when (status) {
                 is NetworkStatus.Available -> {
-                    Timber.d("Gained Ethernet connection")
+                    Timber.i("Gained Ethernet connection")
-                    networkEventsFlow.value =
+                    networkEventsFlow.update {
-                        networkEventsFlow.value.copy(
+                        it.copy(
                             isEthernetConnected = true,
                         )
                     }
+                }
+
                 is NetworkStatus.CapabilitiesChanged -> {
-                    Timber.d("Ethernet capabilities changed")
+                    Timber.i("Ethernet capabilities changed")
-                    networkEventsFlow.value =
+                    networkEventsFlow.update {
-                        networkEventsFlow.value.copy(
+                        it.copy(
                             isEthernetConnected = true,
                         )
                     }
+                }
+
                 is NetworkStatus.Unavailable -> {
-                    networkEventsFlow.value =
+                    networkEventsFlow.update {
-                        networkEventsFlow.value.copy(
+                        it.copy(
                             isEthernetConnected = false,
                         )
-                    Timber.d("Lost Ethernet connection")
+                    }
+                    Timber.i("Lost Ethernet connection")
                 }
             }
         }
     }
 
     private suspend fun watchForWifiConnectivityChanges() {
-        wifiService.networkStatus.collect {
+        wifiService.networkStatus.collect { status ->
-            when (it) {
+            when (status) {
                 is NetworkStatus.Available -> {
-                    Timber.d("Gained Wi-Fi connection")
+                    Timber.i("Gained Wi-Fi connection")
-                    networkEventsFlow.value =
+                    networkEventsFlow.update {
-                        networkEventsFlow.value.copy(
+                        it.copy(
                             isWifiConnected = true,
                         )
                     }
+                }
                 is NetworkStatus.CapabilitiesChanged -> {
-                    Timber.d("Wifi capabilities changed")
+                    Timber.i("Wifi capabilities changed")
-                    networkEventsFlow.value =
+                    networkEventsFlow.update {
-                        networkEventsFlow.value.copy(
+                        it.copy(
                             isWifiConnected = true,
                         )
-                    val ssid = wifiService.getNetworkName(it.networkCapabilities) ?: ""
+                    }
-                    Timber.d("Detected SSID: $ssid")
+                    val ssid = wifiService.getNetworkName(status.networkCapabilities)
-                    networkEventsFlow.value =
+                    ssid?.let { name ->
-                        networkEventsFlow.value.copy(
+                        if(name.contains(Constants.UNREADABLE_SSID)) {
-                            currentNetworkSSID = ssid,
+                            Timber.w("SSID unreadable: missing permissions")
+                        } else Timber.i("Detected valid SSID")
+                        appDataRepository.appState.setCurrentSsid(name)
+                        networkEventsFlow.update {
+                            it.copy(
+                                currentNetworkSSID = name,
                             )
                         }
+                    } ?: Timber.w("Failed to read ssid")
+                }
+
                 is NetworkStatus.Unavailable -> {
-                    networkEventsFlow.value =
+                    networkEventsFlow.update {
-                        networkEventsFlow.value.copy(
+                        it.copy(
                             isWifiConnected = false,
                         )
-                    Timber.d("Lost Wi-Fi connection")
+                    }
+                    Timber.i("Lost Wi-Fi connection")
                 }
             }
         }
     }
 
-    // TODO clean this up
+    private suspend fun getMobileDataTunnel(): TunnelConfig? {
+        return appDataRepository.tunnels.findByMobileDataTunnel().firstOrNull()
+    }
+
+    private suspend fun getSsidTunnel(ssid: String): TunnelConfig? {
+        return appDataRepository.tunnels.findByTunnelNetworksName(ssid).firstOrNull()
+    }
+
+    private fun isTunnelDown() : Boolean {
+        return vpnService.vpnState.value.status == TunnelState.DOWN
+    }
+
     private suspend fun manageVpn() {
-        networkEventsFlow.collectLatest {
+        networkEventsFlow.collectLatest { watcherState ->
-            Timber.i("New watcher state: $it")
+            val autoTunnel = "Auto-tunnel watcher"
-            if (!it.settings.isAutoTunnelPaused && it.settings.defaultTunnel != null) {
+            if (!watcherState.settings.isAutoTunnelPaused) {
-                delay(Constants.TOGGLE_TUNNEL_DELAY)
+                //delay for rapid network state changes and then collect latest
+                delay(Constants.WATCHER_COLLECTION_DELAY)
+                val tunnelConfig = vpnService.vpnState.value.tunnelConfig
                 when {
-                    ((it.isEthernetConnected &&
+                    watcherState.isEthernetConditionMet() -> {
-                        it.settings.isTunnelOnEthernetEnabled &&
+                        Timber.i("$autoTunnel - tunnel on on ethernet condition met")
-                        !it.isVpnConnected)) -> {
+                        if(isTunnelDown()) serviceManager.startVpnServiceForeground(this)
-                        ServiceManager.startVpnServiceForeground(this, it.settings.defaultTunnel!!)
-                        Timber.i("Condition 1 met")
                     }
-                    (!it.isEthernetConnected &&
+
-                        it.settings.isTunnelOnMobileDataEnabled &&
+                    watcherState.isMobileDataConditionMet() -> {
-                        !it.isWifiConnected &&
+                        Timber.i("$autoTunnel - tunnel on on mobile data condition met")
-                        it.isMobileDataConnected &&
+                        if(isTunnelDown()) serviceManager.startVpnServiceForeground(this, getMobileDataTunnel()?.id)
-                        !it.isVpnConnected) -> {
-                        ServiceManager.startVpnServiceForeground(this, it.settings.defaultTunnel!!)
-                        Timber.i("Condition 2 met")
                     }
-                    (!it.isEthernetConnected &&
+
-                        !it.settings.isTunnelOnMobileDataEnabled &&
+                    watcherState.isTunnelOnMobileDataPreferredConditionMet() -> {
-                        !it.isWifiConnected &&
+                        if(tunnelConfig?.isMobileDataTunnel == false) {
-                        it.isVpnConnected) -> {
+                            getMobileDataTunnel()?.let {
-                        ServiceManager.stopVpnService(this)
+                                Timber.i("$autoTunnel - tunnel connected on mobile data is not preferred condition met, switching to preferred")
-                        Timber.i("Condition 3 met")
+                                if(isTunnelDown()) serviceManager.startVpnServiceForeground(
+                                    this,
+                                    getMobileDataTunnel()?.id,
+                                )
                             }
-                    (!it.isEthernetConnected &&
-                        it.isWifiConnected &&
-                        !it.settings.trustedNetworkSSIDs.contains(it.currentNetworkSSID) &&
-                        it.settings.isTunnelOnWifiEnabled &&
-                        (!it.isVpnConnected)) -> {
-                        ServiceManager.startVpnServiceForeground(this, it.settings.defaultTunnel!!)
-                        Timber.i("Condition 4 met")
                         }
-                    (!it.isEthernetConnected &&
-                        (it.isWifiConnected &&
-                            it.settings.trustedNetworkSSIDs.contains(it.currentNetworkSSID)) &&
-                        (it.isVpnConnected)) -> {
-                        ServiceManager.stopVpnService(this)
-                        Timber.i("Condition 5 met")
                     }
-                    (!it.isEthernetConnected &&
+
-                        (it.isWifiConnected &&
+                    watcherState.isTunnelOffOnMobileDataConditionMet() -> {
-                            !it.settings.isTunnelOnWifiEnabled &&
+                        Timber.i("$autoTunnel - tunnel off on mobile data met, turning vpn off")
-                            (it.isVpnConnected))) -> {
+                        if(!isTunnelDown()) serviceManager.stopVpnServiceForeground(this)
-                        ServiceManager.stopVpnService(this)
-                        Timber.i("Condition 6 met")
                     }
-                    (!it.isEthernetConnected &&
+
-                        !it.isWifiConnected &&
+                    watcherState.isUntrustedWifiConditionMet() -> {
-                        !it.isMobileDataConnected &&
+                        if(tunnelConfig?.tunnelNetworks?.contains(watcherState.currentNetworkSSID) == false ||
-                        (it.isVpnConnected)) -> {
+                            tunnelConfig == null) {
-                        ServiceManager.stopVpnService(this)
+                            Timber.i("$autoTunnel - tunnel on ssid not associated with current tunnel condition met")
-                        Timber.i("Condition 7 met")
+                            getSsidTunnel(watcherState.currentNetworkSSID)?.let {
+                                Timber.i("Found tunnel associated with this SSID, bringing tunnel up")
+                                if(isTunnelDown()) serviceManager.startVpnServiceForeground(this, it.id)
+                            } ?: suspend {
+                                Timber.i("No tunnel associated with this SSID, using defaults")
+                                if (appDataRepository.getPrimaryOrFirstTunnel()?.name != vpnService.name) {
+                                    if(isTunnelDown()) serviceManager.startVpnServiceForeground(this)
                                 }
+                            }.invoke()
+                        }
+                    }
+
+                    watcherState.isTrustedWifiConditionMet() -> {
+                        Timber.i("$autoTunnel - tunnel off on trusted wifi condition met, turning vpn off")
+                        if(!isTunnelDown()) serviceManager.stopVpnServiceForeground(this)
+                    }
+
+                    watcherState.isTunnelOffOnWifiConditionMet() -> {
+                        Timber.i("$autoTunnel - tunnel off on wifi condition met, turning vpn off")
+                        if(!isTunnelDown()) serviceManager.stopVpnServiceForeground(this)
+                    }
+
+                    watcherState.isTunnelOffOnNoConnectivityMet() -> {
+                        Timber.i("$autoTunnel - tunnel off on no connectivity met, turning vpn off")
+                        if(!isTunnelDown()) serviceManager.stopVpnServiceForeground(this)
+                    }
+
                     else -> {
-                        Timber.i("No condition met")
+                        Timber.i("$autoTunnel - no condition met")
                     }
                 }
             }

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

@@ -6,17 +6,17 @@ import android.os.Bundle
 import androidx.core.app.ServiceCompat
 import androidx.lifecycle.lifecycleScope
 import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.data.model.TunnelConfig
+import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
-import com.zaneschepke.wireguardautotunnel.data.repository.SettingsRepository
-import com.zaneschepke.wireguardautotunnel.data.repository.TunnelConfigRepository
 import com.zaneschepke.wireguardautotunnel.receiver.NotificationActionReceiver
 import com.zaneschepke.wireguardautotunnel.service.notification.NotificationService
 import com.zaneschepke.wireguardautotunnel.service.tunnel.HandshakeStatus
+import com.zaneschepke.wireguardautotunnel.service.tunnel.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.Job
 import kotlinx.coroutines.delay
@@ -28,23 +28,24 @@ import javax.inject.Inject
 class WireGuardTunnelService : ForegroundService() {
     private val foregroundId = 123
 
-    @Inject lateinit var vpnService: VpnService
+    @Inject
+    lateinit var vpnService: VpnService
 
-    @Inject lateinit var settingsRepository: SettingsRepository
+    @Inject
+    lateinit var appDataRepository: AppDataRepository
 
-    @Inject lateinit var tunnelConfigRepository: TunnelConfigRepository
+    @Inject
+    lateinit var notificationService: NotificationService
 
-    @Inject lateinit var notificationService: NotificationService
+    private var job: Job? = null
 
-    private lateinit var job: Job
-
-    private var tunnelName: String = ""
     private var didShowConnected = false
 
     override fun onCreate() {
         super.onCreate()
         lifecycleScope.launch(Dispatchers.Main) {
-            if (tunnelConfigRepository.getAll().isNotEmpty()) {
+            //TODO fix this to not launch if AOVPN
+            if (appDataRepository.tunnels.count() != 0) {
                 launchVpnNotification()
             }
         }
@@ -53,42 +54,28 @@ 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(Dispatchers.IO) {
                 launch {
-                    if (tunnelConfig != null) {
+                    val tunnelId = extras?.getInt(Constants.TUNNEL_EXTRA_KEY)
-                        try {
+                    if (vpnService.getState() == TunnelState.UP) {
-                            tunnelName = tunnelConfig.name
+                        vpnService.stopTunnel()
-                            vpnService.startTunnel(tunnelConfig)
-                        } catch (e: Exception) {
-                            Timber.e("Problem starting tunnel: ${e.message}")
-                            stopService(extras)
                     }
-                    } else {
+                    vpnService.startTunnel(
-                        Timber.d("Tunnel config null, starting default tunnel or first")
+                        tunnelId?.let {
-                        val settings = settingsRepository.getSettings()
+                            appDataRepository.tunnels.getById(it)
-                        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() {
+        var tunnelName: String? = null
         vpnService.vpnState.collect { state ->
                 state.statistics
                 ?.mapPeerStats()
@@ -98,26 +85,42 @@ 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",
+                )
             }
         }
     }
 
-    override fun stopService(extras: Bundle?) {
+    private fun launchAlwaysOnDisabledNotification() {
-        super.stopService(extras)
+        launchVpnNotification(
+            title = this.getString(R.string.vpn_connection_failed),
+            description = this.getString(R.string.always_on_disabled),
+        )
+    }
+
+    override fun stopService() {
+        super.stopService()
         lifecycleScope.launch(Dispatchers.IO) {
             vpnService.stopTunnel()
             didShowConnected = false
@@ -176,8 +179,10 @@ class WireGuardTunnelService : ForegroundService() {
     }
 
     private fun cancelJob() {
-        if (this::job.isInitialized) {
+        try {
-            job.cancel()
+            job?.cancel()
+        } catch (e : CancellationException) {
+            Timber.i("Tunnel job cancelled")
         }
     }
 }

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

@@ -53,6 +53,7 @@ abstract class BaseNetworkService<T : BaseNetworkService<T>>(
                         }
                     }
                 }
+
                 else -> {
                     object : ConnectivityManager.NetworkCallback() {
                         override fun onAvailable(network: Network) {

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

@@ -94,7 +94,7 @@ class WireGuardNotification @Inject constructor(@ApplicationContext private val
                 .setOngoing(onGoing)
                 .setPriority(NotificationCompat.PRIORITY_HIGH)
                 .setShowWhen(showTimestamp)
-                .setSmallIcon(R.mipmap.ic_launcher_foreground)
+                .setSmallIcon(R.drawable.ic_launcher)
                 .build()
         }
     }

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

@@ -1,80 +1,66 @@
 package com.zaneschepke.wireguardautotunnel.service.shortcut
 
 import android.os.Bundle
-import android.view.View
 import androidx.activity.ComponentActivity
-import androidx.lifecycle.lifecycleScope
+import com.zaneschepke.wireguardautotunnel.WireGuardAutoTunnel
-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.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.Dispatchers
 import kotlinx.coroutines.launch
-import timber.log.Timber
 import javax.inject.Inject
 
 @AndroidEntryPoint
 class ShortcutsActivity : ComponentActivity() {
-    @Inject lateinit var settingsRepository: SettingsRepository
 
-    @Inject lateinit var tunnelConfigRepository: TunnelConfigRepository
+    @Inject
+    lateinit var appDataRepository: AppDataRepository
 
-    private suspend fun toggleWatcherServicePause() {
+    @Inject
-        val settings = settingsRepository.getSettings()
+    lateinit var serviceManager: ServiceManager
-        if (settings.isAutoTunnelEnabled) {
-            val pauseAutoTunnel = !settings.isAutoTunnelPaused
-            settingsRepository.save(
-                settings.copy(
-                    isAutoTunnelPaused = pauseAutoTunnel,
-                ),
-            )
-        }
-    }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(View(this))
+        WireGuardAutoTunnel.applicationScope.launch(Dispatchers.IO) {
-        if (
+            val settings = appDataRepository.settings.getSettings()
-            intent
-                .getStringExtra(CLASS_NAME_EXTRA_KEY)
-                .equals(WireGuardTunnelService::class.java.simpleName)
-        ) {
-            lifecycleScope.launch(Dispatchers.Main) {
-                val settings = settingsRepository.getSettings()
             if (settings.isShortcutsEnabled) {
-                    try {
+                when (intent.getStringExtra(CLASS_NAME_EXTRA_KEY)) {
+                    WireGuardTunnelService::class.java.simpleName -> {
                         val tunnelName = intent.getStringExtra(TUNNEL_NAME_EXTRA_KEY)
-                        val tunnelConfig =
+                        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.STOP.name ->
+                            Action.START.name -> serviceManager.startVpnServiceForeground(
-                                ServiceManager.stopVpnService(
+                                this@ShortcutsActivity, tunnelConfig?.id, isManualStart = true,
-                                    this@ShortcutsActivity,
                             )
-                            Action.START.name ->
+
-                                ServiceManager.startVpnServiceForeground(
+                            Action.STOP.name -> serviceManager.stopVpnServiceForeground(
                                 this@ShortcutsActivity,
-                                    tunnelConfig.toString(),
+                                isManualStop = true,
+                            )
+                        }
+                    }
+
+                    WireGuardConnectivityWatcherService::class.java.simpleName -> {
+                        when (intent.action) {
+                            Action.START.name -> appDataRepository.settings.save(
+                                settings.copy(
+                                    isAutoTunnelPaused = false,
+                                ),
+                            )
+
+                            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

@@ -0,0 +1,111 @@
+package com.zaneschepke.wireguardautotunnel.service.tile
+
+import android.os.Build
+import android.service.quicksettings.Tile
+import android.service.quicksettings.TileService
+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.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.cancel
+import kotlinx.coroutines.flow.collectLatest
+import kotlinx.coroutines.launch
+import timber.log.Timber
+import javax.inject.Inject
+
+@AndroidEntryPoint
+class AutoTunnelControlTile : TileService() {
+
+    @Inject
+    lateinit var appDataRepository: AppDataRepository
+
+    @Inject
+    lateinit var serviceManager: ServiceManager
+
+    private val scope = CoroutineScope(Dispatchers.IO)
+
+    private var manualStartConfig: TunnelConfig? = null
+
+    override fun onStartListening() {
+        super.onStartListening()
+        scope.launch {
+            appDataRepository.settings.getSettingsFlow().collectLatest {
+                when (it.isAutoTunnelEnabled) {
+                    true -> {
+                        if (it.isAutoTunnelPaused) {
+                            setInactive()
+                            setTileDescription(this@AutoTunnelControlTile.getString(R.string.paused))
+                        } else {
+                            setActive()
+                            setTileDescription(this@AutoTunnelControlTile.getString(R.string.active))
+                        }
+                    }
+
+                    false -> {
+                        setTileDescription(this@AutoTunnelControlTile.getString(R.string.disabled))
+                        setUnavailable()
+                    }
+                }
+            }
+        }
+    }
+
+    override fun onTileAdded() {
+        super.onTileAdded()
+        onStartListening()
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        scope.cancel()
+    }
+
+    override fun onTileRemoved() {
+        super.onTileRemoved()
+        scope.cancel()
+    }
+
+    override fun onClick() {
+        super.onClick()
+        unlockAndRun {
+            scope.launch {
+                try {
+                    appDataRepository.toggleWatcherServicePause()
+                } 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()
+    }
+}

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

@@ -3,11 +3,10 @@ package com.zaneschepke.wireguardautotunnel.service.tile
 import android.os.Build
 import android.service.quicksettings.Tile
 import android.service.quicksettings.TileService
-import com.wireguard.android.backend.Tunnel
+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.data.repository.TunnelConfigRepository
 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
@@ -18,41 +17,43 @@ import timber.log.Timber
 import javax.inject.Inject
 
 @AndroidEntryPoint
-class TunnelControlTile() : TileService() {
+class TunnelControlTile : TileService() {
 
-    @Inject lateinit var tunnelConfigRepository: TunnelConfigRepository
+    @Inject
+    lateinit var appDataRepository: AppDataRepository
 
-    @Inject lateinit var settingsRepository: SettingsRepository
+    @Inject
+    lateinit var vpnService: VpnService
 
-    @Inject lateinit var vpnService: VpnService
+    @Inject
+    lateinit var serviceManager: ServiceManager
 
     private val scope = CoroutineScope(Dispatchers.IO)
 
-    private var tunnelName: String? = null
+    private var manualStartConfig: TunnelConfig? = null
 
     override fun onStartListening() {
         super.onStartListening()
         Timber.d("On start listening called")
         scope.launch {
-            vpnService.vpnState.collect {
+            vpnService.vpnState.collect { it ->
                 when (it.status) {
-                    Tunnel.State.UP -> setActive()
+                    TunnelState.UP -> {
-                    Tunnel.State.DOWN -> setInactive()
+                        setActive()
+                        it.tunnelConfig?.name?.let { name -> setTileDescription(name) }
+                    }
+
+                    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 ?: "")
             }
         }
     }
@@ -67,20 +68,24 @@ class TunnelControlTile() : TileService() {
         scope.cancel()
     }
 
+    override fun onTileAdded() {
+        super.onTileAdded()
+        onStartListening()
+    }
+
     override fun onClick() {
         super.onClick()
         unlockAndRun {
             scope.launch {
                 try {
-                    val tunnelConfig =
+                    if (vpnService.getState() == TunnelState.UP) {
-                        tunnelConfigRepository.getAll().first { it.name == tunnelName }
+                        serviceManager.stopVpnServiceForeground(
-                    toggleWatcherServicePause()
-                    if (vpnService.getState() == Tunnel.State.UP) {
-                        ServiceManager.stopVpnService(this@TunnelControlTile)
-                    } else {
-                        ServiceManager.startVpnServiceForeground(
                             this@TunnelControlTile,
-                            tunnelConfig.toString(),
+                            isManualStop = true,
+                        )
+                    } else {
+                        serviceManager.startVpnServiceForeground(
+                            this@TunnelControlTile, manualStartConfig?.id, isManualStart = true,
                         )
                     }
                 } catch (e: Exception) {
@@ -92,20 +97,6 @@ class TunnelControlTile() : TileService() {
         }
     }
 
-    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()
@@ -117,6 +108,7 @@ class TunnelControlTile() : TileService() {
     }
 
     private fun setUnavailable() {
+        manualStartConfig = null
         qsTile.state = Tile.STATE_UNAVAILABLE
         qsTile.updateTile()
     }

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

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

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

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

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

@@ -2,15 +2,17 @@ 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.model.TunnelConfig
+import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
-import com.zaneschepke.wireguardautotunnel.data.repository.SettingsRepository
+import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
 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.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
@@ -19,65 +21,91 @@ import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.launch
+import org.amnezia.awg.backend.Tunnel
 import timber.log.Timber
 import javax.inject.Inject
 
 class WireGuardTunnel
 @Inject
 constructor(
+    private val userspaceAmneziaBackend : org.amnezia.awg.backend.Backend,
     @Userspace private val userspaceBackend: Backend,
     @Kernel private val kernelBackend: Backend,
-    private val settingsRepository: SettingsRepository
+    private val appDataRepository: AppDataRepository,
 ) : VpnService {
     private val _vpnState = MutableStateFlow(VpnState())
     override val vpnState: StateFlow<VpnState> = _vpnState.asStateFlow()
 
     private val scope = CoroutineScope(Dispatchers.IO)
 
-    private lateinit var statsJob: Job
+    private var statsJob: Job? = null
-
-    private var config: Config? = null
 
     private var backend: Backend = userspaceBackend
 
-    private var backendIsUserspace = true
+    private var backendIsWgUserspace = true
+
+    private var backendIsAmneziaUserspace = false
 
     init {
         scope.launch {
-            settingsRepository.getSettingsFlow().collect {
+            appDataRepository.settings.getSettingsFlow().collect {
-                if (it.isKernelEnabled && backendIsUserspace) {
+                if (it.isKernelEnabled && (backendIsWgUserspace || backendIsAmneziaUserspace)) {
                     Timber.d("Setting kernel backend")
                     backend = kernelBackend
-                    backendIsUserspace = false
+                    backendIsWgUserspace = false
-                } else if (!it.isKernelEnabled && !backendIsUserspace) {
+                    backendIsAmneziaUserspace = false
-                    Timber.d("Setting userspace backend")
+                } else if (!it.isKernelEnabled && !it.isAmneziaEnabled && !backendIsWgUserspace) {
+                    Timber.d("Setting WireGuard userspace backend")
                     backend = userspaceBackend
-                    backendIsUserspace = true
+                    backendIsWgUserspace = true
+                    backendIsAmneziaUserspace = false
+                } else if (it.isAmneziaEnabled && !backendIsAmneziaUserspace) {
+                    Timber.d("Setting Amnezia userspace backend")
+                    backendIsAmneziaUserspace = true
+                    backendIsWgUserspace = false
                 }
             }
         }
     }
 
-    override suspend fun startTunnel(tunnelConfig: TunnelConfig): State {
+    private fun setState(tunnelConfig: TunnelConfig?, tunnelState: TunnelState) : TunnelState {
-        return try {
+        return if(backendIsAmneziaUserspace) {
-            stopTunnelOnConfigChange(tunnelConfig)
+            Timber.i("Using Amnezia backend")
-            emitTunnelName(tunnelConfig.name)
+            val config = tunnelConfig?.let {
-            config = TunnelConfig.configFromQuick(tunnelConfig.wgQuick)
+                if(it.amQuick != "") TunnelConfig.configFromAmQuick(it.amQuick) else {
-            val state =
+                    Timber.w("Using backwards compatible wg config, amnezia specific config not found.")
-                backend.setState(
+                    TunnelConfig.configFromAmQuick(it.wgQuick)
+                }
+            }
+            val state = userspaceAmneziaBackend.setState(this, tunnelState.toAmState(), config)
+            TunnelState.from(state)
+        } else {
+            Timber.i("Using Wg backend")
+            val wgConfig = tunnelConfig?.let { TunnelConfig.configFromWgQuick(it.wgQuick) }
+            val state = backend.setState(
                 this,
-                    State.UP,
+                tunnelState.toWgState(),
-                    config,
+                wgConfig,
             )
-            emitTunnelState(state)
+            TunnelState.from(state)
-            state
-        } catch (e: Exception) {
-            Timber.e("Failed to start tunnel with error: ${e.message}")
-            State.DOWN
         }
     }
 
-    private fun emitTunnelState(state: State) {
+    override suspend fun startTunnel(tunnelConfig: TunnelConfig?): TunnelState {
+        return try {
+            //TODO we need better error handling here
+            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)
+        }
+    }
+
+    private fun emitTunnelState(state : TunnelState) {
         _vpnState.tryEmit(
             _vpnState.value.copy(
                 status = state,
@@ -85,7 +113,7 @@ constructor(
         )
     }
 
-    private fun emitBackendStatistics(statistics: Statistics) {
+    private fun emitBackendStatistics(statistics: TunnelStatistics) {
         _vpnState.tryEmit(
             _vpnState.value.copy(
                 statistics = statistics,
@@ -93,57 +121,73 @@ constructor(
         )
     }
 
-    private suspend fun emitTunnelName(name: String) {
+    private suspend fun emitTunnelConfig(tunnelConfig: TunnelConfig?) {
         _vpnState.emit(
             _vpnState.value.copy(
-                name = name,
+                tunnelConfig = tunnelConfig,
             ),
         )
     }
 
-    private suspend fun stopTunnelOnConfigChange(tunnelConfig: TunnelConfig) {
+    private fun resetVpnState() {
-        if (getState() == State.UP && _vpnState.value.name != tunnelConfig.name) {
+        _vpnState.tryEmit(VpnState())
-            stopTunnel()
-        }
-    }
-
-    override fun getName(): String {
-        return _vpnState.value.name
     }
 
     override suspend fun stopTunnel() {
         try {
-            if (getState() == State.UP) {
+            if (getState() == TunnelState.UP) {
-                val state = backend.setState(this, State.DOWN, null)
+                val state = setState(null, TunnelState.DOWN)
+                resetVpnState()
                 emitTunnelState(state)
             }
         } catch (e: BackendException) {
-            Timber.e("Failed to stop tunnel with error: ${e.message}")
+            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(): State {
+    override fun getState(): TunnelState {
-        return backend.getState(this)
+        return if(backendIsAmneziaUserspace) TunnelState.from(userspaceAmneziaBackend.getState(this))
+        else TunnelState.from(backend.getState(this))
     }
 
-    override fun onStateChange(state: State) {
+    override fun getName(): String {
+        return _vpnState.value.tunnelConfig?.name ?: ""
+    }
+
+
+    override fun onStateChange(newState: Tunnel.State) {
+        handleStateChange(TunnelState.from(newState))
+    }
+
+    private fun handleStateChange(state: TunnelState) {
         val tunnel = this
         emitTunnelState(state)
-        WireGuardAutoTunnel.requestTileServiceStateUpdate()
+        WireGuardAutoTunnel.requestTunnelTileServiceStateUpdate()
-        if (state == State.UP) {
+        if (state == TunnelState.UP) {
             statsJob =
                 scope.launch {
                     while (true) {
-                        val statistics = backend.getStatistics(tunnel)
+                        if(backendIsAmneziaUserspace) {
-                        emitBackendStatistics(statistics)
+                            emitBackendStatistics(AmneziaStatistics(userspaceAmneziaBackend.getStatistics(tunnel)))
+                        } else {
+                            emitBackendStatistics(WireGuardStatistics(backend.getStatistics(tunnel)))
+                        }
                         delay(Constants.VPN_STATISTIC_CHECK_INTERVAL)
                     }
                 }
         }
-        if (state == State.DOWN) {
+        if (state == TunnelState.DOWN) {
-            if (this::statsJob.isInitialized) {
+            try {
-                statsJob.cancel()
+                statsJob?.cancel()
+            } catch (e : CancellationException) {
+                Timber.i("Stats job cancelled")
             }
         }
     }
+
+    override fun onStateChange(state: State) {
+        handleStateChange(TunnelState.from(state))
+    }
 }

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

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

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

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

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

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

@@ -0,0 +1,159 @@
+package com.zaneschepke.wireguardautotunnel.ui
+
+import android.content.ActivityNotFoundException
+import android.content.Context
+import android.content.Intent
+import android.net.Uri
+import android.widget.Toast
+import androidx.compose.runtime.mutableStateListOf
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.wireguard.android.backend.GoBackend
+import com.zaneschepke.logcatter.Logcatter
+import com.zaneschepke.logcatter.model.LogMessage
+import com.zaneschepke.wireguardautotunnel.R
+import com.zaneschepke.wireguardautotunnel.WireGuardAutoTunnel
+import com.zaneschepke.wireguardautotunnel.util.Constants
+import com.zaneschepke.wireguardautotunnel.util.FileUtils
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.launch
+import timber.log.Timber
+import java.time.Instant
+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,
+            )
+        }
+    }
+
+    val logs = mutableStateListOf<LogMessage>()
+
+    fun readLogCatOutput() =
+        viewModelScope.launch(viewModelScope.coroutineContext + Dispatchers.IO) {
+            launch {
+                Logcatter.logs(callback = {
+                    logs.add(it)
+                    if (logs.size > Constants.LOG_BUFFER_SIZE) {
+                        logs.removeRange(0, (logs.size - Constants.LOG_BUFFER_SIZE).toInt())
+                    }
+                })
+            }
+        }
+
+    fun clearLogs() {
+        logs.clear()
+        Logcatter.clear()
+    }
+
+    fun saveLogsToFile(context: Context) {
+        val fileName = "${Constants.BASE_LOG_FILE_NAME}-${Instant.now().epochSecond}.txt"
+        val content = logs.joinToString(separator = "\n")
+        FileUtils.saveFileToDownloads(context.applicationContext, content, fileName)
+        Toast.makeText(context, context.getString(R.string.logs_saved), Toast.LENGTH_SHORT)
+            .show()
+    }
+
+    fun setNotificationPermissionAccepted(accepted: Boolean) {
+        _appUiState.update {
+            it.copy(
+                notificationPermissionAccepted = accepted,
+            )
+        }
+    }
+}

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

@@ -1,16 +1,17 @@
 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 android.provider.Settings
+import androidx.activity.SystemBarStyle
 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.fillMaxSize
+import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.SnackbarData
@@ -21,41 +22,46 @@ import androidx.compose.material3.SnackbarResult
 import androidx.compose.material3.surfaceColorAtElevation
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.focus.focusProperties
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.toArgb
 import androidx.compose.ui.unit.dp
-import androidx.lifecycle.ProcessLifecycleOwner
+import androidx.hilt.navigation.compose.hiltViewModel
+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.wireguard.android.backend.GoBackend
 import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.WireGuardAutoTunnel
 import com.zaneschepke.wireguardautotunnel.data.datastore.DataStoreManager
 import com.zaneschepke.wireguardautotunnel.data.repository.SettingsRepository
-import com.zaneschepke.wireguardautotunnel.ui.common.PermissionRequestFailedScreen
+import com.zaneschepke.wireguardautotunnel.service.foreground.ServiceManager
 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.theme.TransparentSystemBars
+import com.zaneschepke.wireguardautotunnel.ui.screens.support.logs.LogsScreen
 import com.zaneschepke.wireguardautotunnel.ui.theme.WireguardAutoTunnelTheme
-import com.zaneschepke.wireguardautotunnel.util.Constants
+import com.zaneschepke.wireguardautotunnel.util.StringValue
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
-import timber.log.Timber
+import xyz.teamgravity.pin_lock_compose.PinManager
-import java.io.IOException
 import javax.inject.Inject
 
 @AndroidEntryPoint
@@ -64,73 +70,57 @@ class MainActivity : AppCompatActivity() {
     @Inject
     lateinit var dataStoreManager: DataStoreManager
 
-    @Inject lateinit var settingsRepository: SettingsRepository
+    @Inject
+    lateinit var settingsRepository: SettingsRepository
+
+    @Inject
+    lateinit var serviceManager: ServiceManager
+
     @OptIn(
         ExperimentalPermissionsApi::class,
     )
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
+        enableEdgeToEdge(navigationBarStyle = SystemBarStyle.dark(Color.Transparent.toArgb()))
+
         // load preferences into memory and init data
         lifecycleScope.launch {
-            try {
             dataStoreManager.init()
-                if (settingsRepository.getAll().isEmpty()) {
+            WireGuardAutoTunnel.requestTunnelTileServiceStateUpdate()
-                    settingsRepository.save(com.zaneschepke.wireguardautotunnel.data.model.Settings())
+            val settings = settingsRepository.getSettings()
-                }
+            if (settings.isAutoTunnelEnabled) {
-                WireGuardAutoTunnel.requestTileServiceStateUpdate()
+                serviceManager.startWatcherService(application.applicationContext)
-            } catch (e: IOException) {
-                Timber.e("Failed to load preferences")
             }
         }
         setContent {
-            //            val activityViewModel = hiltViewModel<ActivityViewModel>()
+            val appViewModel = hiltViewModel<AppViewModel>()
-
+            val appUiState by appViewModel.appUiState.collectAsStateWithLifecycle()
             val navController = rememberNavController()
-            val focusRequester = remember { FocusRequester() }
+            val navBackStackEntry by navController.currentBackStackEntryAsState()
 
-            WireguardAutoTunnelTheme {
+            val notificationPermissionState =
-                TransparentSystemBars()
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU)
+                    rememberPermissionState(Manifest.permission.POST_NOTIFICATIONS) else null
 
             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) {
-                                vpnIntent = null
+                            appViewModel.onVpnPermissionAccepted()
                         }
                     },
                 )
-                LaunchedEffect(vpnIntent) {
-                    if (vpnIntent != null) {
-                        vpnActivityResultState.launch(vpnIntent)
-                    } else {
-                        requestNotificationPermission()
-                    }
-                }
 
-                fun showSnackBarMessage(message: String) {
+            fun showSnackBarMessage(message: StringValue) {
                 lifecycleScope.launch(Dispatchers.Main) {
                     val result =
                         snackbarHostState.showSnackbar(
-                                message = message,
+                            message = message.asString(this@MainActivity),
-                                actionLabel = applicationContext.getString(R.string.okay),
                             duration = SnackbarDuration.Short,
                         )
                     when (result) {
@@ -142,6 +132,41 @@ class MainActivity : AppCompatActivity() {
                 }
             }
 
+            LaunchedEffect(appUiState.requestPermissions) {
+                if (appUiState.requestPermissions) {
+                    appViewModel.permissionsRequested()
+                    if (notificationPermissionState != null && !notificationPermissionState.status.isGranted
+                    ) {
+                        showSnackBarMessage(StringValue.StringResource(R.string.notification_permission_required))
+                        return@LaunchedEffect notificationPermissionState.launchPermissionRequest()
+                    }
+                    if (!appUiState.vpnPermissionAccepted) {
+                        return@LaunchedEffect appViewModel.vpnIntent?.let {
+                            vpnActivityResultState.launch(
+                                it
+                            )
+                        }!!
+                    }
+                }
+            }
+
+            WireguardAutoTunnelTheme {
+                LaunchedEffect(Unit) {
+                    appViewModel.setNotificationPermissionAccepted(
+                        notificationPermissionState?.status?.isGranted ?: true,
+                    )
+                    if (!WireGuardAutoTunnel.isRunningOnAndroidTv()) appViewModel.readLogCatOutput()
+                }
+
+                LaunchedEffect(appUiState.snackbarMessageConsumed) {
+                    if (!appUiState.snackbarMessageConsumed) {
+                        showSnackBarMessage(StringValue.DynamicString(appUiState.snackbarMessage))
+                        appViewModel.snackbarMessageConsumed()
+                    }
+                }
+
+                val focusRequester = remember { FocusRequester() }
+
                 Scaffold(
                     snackbarHost = {
                         SnackbarHost(snackbarHostState) { snackbarData: SnackbarData ->
@@ -155,10 +180,16 @@ class MainActivity : AppCompatActivity() {
                             )
                         }
                     },
-                    modifier = Modifier.focusable().focusProperties { up = focusRequester },
+                    //TODO refactor
-                    bottomBar =
+                    modifier = Modifier
-                        if (vpnIntent == null && notificationPermissionState.status.isGranted) {
+                        .focusable()
-                            {
+                        .focusProperties {
+                            when (navBackStackEntry?.destination?.route) {
+                                Screen.Lock.route -> Unit
+                                else -> up = focusRequester
+                            }
+                        },
+                    bottomBar = {
                         BottomNavBar(
                             navController,
                             listOf(
@@ -167,47 +198,23 @@ class MainActivity : AppCompatActivity() {
                                 Screen.Support.navItem,
                             ),
                         )
-                            }
-                        } else {
-                            {}
                     },
                 ) { padding ->
-                    if (vpnIntent != null) {
+                    NavHost(
-                        PermissionRequestFailedScreen(
+                        navController,
-                            padding = padding,
+                        startDestination =
-                            onRequestAgain = { vpnActivityResultState.launch(vpnIntent) },
+                        (if (PinManager.pinExists()) Screen.Lock.route else Screen.Main.route),
-                            message = getString(R.string.vpn_permission_required),
+                        modifier =
-                            getString(R.string.retry),
+                        Modifier
-                        )
+                            .padding(padding)
-                        return@Scaffold
+                            .fillMaxSize(),
-                    }
+                    ) {
-                    if (!notificationPermissionState.status.isGranted) {
-                        PermissionRequestFailedScreen(
-                            padding = padding,
-                            onRequestAgain = {
-                                val intentSettings =
-                                    Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS)
-                                intentSettings.data =
-                                    Uri.fromParts(
-                                        Constants.URI_PACKAGE_SCHEME,
-                                        this.packageName,
-                                        null,
-                                    )
-                                startActivity(intentSettings)
-                            },
-                            message = getString(R.string.notification_permission_required),
-                            getString(R.string.open_settings),
-                        )
-                        return@Scaffold
-                    }
-                    NavHost(navController, startDestination = Screen.Main.route) {
                         composable(
                             Screen.Main.route,
                         ) {
                             MainScreen(
-                                padding = padding,
                                 focusRequester = focusRequester,
-                                showSnackbarMessage = { message -> showSnackBarMessage(message) },
+                                appViewModel = appViewModel,
                                 navController = navController,
                             )
                         }
@@ -215,8 +222,8 @@ class MainActivity : AppCompatActivity() {
                             Screen.Settings.route,
                         ) {
                             SettingsScreen(
-                                padding = padding,
+                                appViewModel = appViewModel,
-                                showSnackbarMessage = { message -> showSnackBarMessage(message) },
+                                navController = navController,
                                 focusRequester = focusRequester,
                             )
                         }
@@ -224,25 +231,56 @@ class MainActivity : AppCompatActivity() {
                             Screen.Support.route,
                         ) {
                             SupportScreen(
-                                padding = padding,
                                 focusRequester = focusRequester,
-                                showSnackbarMessage = { message -> showSnackBarMessage(message) },
+                                appViewModel = appViewModel,
+                                navController = navController,
                             )
                         }
-                        composable("${Screen.Config.route}/{id}") {
+                        composable(Screen.Support.Logs.route) {
+                            LogsScreen(appViewModel)
+                        }
+                            //TODO fix navigation for amnezia
+                        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,
-                                    id = id,
+                                    tunnelId = id,
-                                    showSnackbarMessage = { message ->
+                                    appViewModel = appViewModel,
-                                        showSnackBarMessage(message)
+                                    focusRequester = focusRequester,
-                                    },
+                                    configType = configType
+                                )
+                            }
+                        }
+                        composable("${Screen.Option.route}/{id}") {
+                            val id = it.arguments?.getString("id")
+                            if (!id.isNullOrBlank()) {
+                                OptionsScreen(
+                                    navController = navController,
+                                    tunnelId = id,
+                                    appViewModel = appViewModel,
                                     focusRequester = focusRequester,
                                 )
                             }
                         }
+                        composable(Screen.Lock.route) {
+                            PinLockScreen(
+                                navController = navController,
+                                appViewModel = appViewModel,
+                            )
+                        }
                     }
                 }
             }

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

@@ -4,13 +4,15 @@ 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 = "Tunnels",
+                name = WireGuardAutoTunnel.instance.getString(R.string.tunnels),
                 route = route,
                 icon = Icons.Rounded.Home,
             )
@@ -19,7 +21,7 @@ sealed class Screen(val route: String) {
     data object Settings : Screen("settings") {
         val navItem =
             BottomNavItem(
-                name = "Settings",
+                name = WireGuardAutoTunnel.instance.getString(R.string.settings),
                 route = route,
                 icon = Icons.Rounded.Settings,
             )
@@ -28,11 +30,16 @@ sealed class Screen(val route: String) {
     data object Support : Screen("support") {
         val navItem =
             BottomNavItem(
-                name = "Support",
+                name = WireGuardAutoTunnel.instance.getString(R.string.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/common/ClickableIconButton.kt

@@ -10,8 +10,6 @@ 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(
@@ -29,9 +27,12 @@ fun ClickableIconButton(
         Spacer(modifier = Modifier.size(ButtonDefaults.IconSpacing))
         Icon(
             imageVector = icon,
-            contentDescription = stringResource(R.string.delete),
+            contentDescription = icon.name,
             modifier =
-                Modifier.size(ButtonDefaults.IconSize).weight(1f, false).clickable {
+            Modifier
+                .size(ButtonDefaults.IconSize)
+                .weight(1f, false)
+                .clickable {
                     if (enabled) {
                         onIconClick()
                     }

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

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

@@ -17,7 +17,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import com.wireguard.android.backend.Statistics
+import com.zaneschepke.wireguardautotunnel.service.tunnel.statistics.TunnelStatistics
 import com.zaneschepke.wireguardautotunnel.util.NumberUtils
 import com.zaneschepke.wireguardautotunnel.util.toThreeDecimalPlaceString
 
@@ -30,11 +30,12 @@ fun RowListItem(
     onClick: () -> Unit,
     rowButton: @Composable () -> Unit,
     expanded: Boolean,
-    statistics: Statistics?
+    statistics: TunnelStatistics?
 ) {
     Box(
         modifier =
-            Modifier.animateContentSize()
+        Modifier
+            .animateContentSize()
             .clip(RoundedCornerShape(30.dp))
             .combinedClickable(
                 onClick = { onClick() },
@@ -43,13 +44,14 @@ fun RowListItem(
     ) {
         Column {
             Row(
-                modifier = Modifier.fillMaxWidth().padding(horizontal = 15.dp, vertical = 5.dp),
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .padding(horizontal = 15.dp, vertical = 5.dp),
                 verticalAlignment = Alignment.CenterVertically,
                 horizontalArrangement = Arrangement.SpaceBetween,
             ) {
                 Row(
                     verticalAlignment = Alignment.CenterVertically,
-                    modifier = Modifier.fillMaxWidth(.60f),
                 ) {
                     icon()
                     Text(text)
@@ -57,17 +59,19 @@ fun RowListItem(
                 rowButton()
             }
             if (expanded) {
-                statistics?.peers()?.forEach {
+                statistics?.getPeers()?.forEach {
                     Row(
                         modifier =
-                            Modifier.fillMaxWidth()
+                        Modifier
+                            .fillMaxWidth()
                             .padding(end = 10.dp, bottom = 10.dp, start = 10.dp),
                         verticalAlignment = Alignment.CenterVertically,
                         horizontalArrangement = Arrangement.SpaceEvenly,
                     ) {
-                        val handshakeEpoch = statistics.peer(it)!!.latestHandshakeEpochMillis
+                        //TODO change these to string resources
-                        val peerTx = statistics.peer(it)!!.txBytes
+                        val handshakeEpoch = statistics.peerStats(it)!!.latestHandshakeEpochMillis
-                        val peerRx = statistics.peer(it)!!.rxBytes
+                        val peerTx = statistics.peerStats(it)!!.txBytes
+                        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

@@ -73,7 +73,8 @@ fun SearchBar(onQuery: (queryString: String) -> Unit) {
         singleLine = true,
         keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Text),
         modifier =
-            Modifier.fillMaxWidth()
+        Modifier
+            .fillMaxWidth()
             .background(color = MaterialTheme.colorScheme.background, shape = RectangleShape),
     )
 }

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

@@ -9,6 +9,7 @@ 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
@@ -21,11 +22,18 @@ fun ConfigurationToggle(
     modifier: Modifier = Modifier
 ) {
     Row(
-        modifier = Modifier.fillMaxWidth().padding(padding),
+        modifier = Modifier
+            .fillMaxWidth()
+            .padding(padding),
         verticalAlignment = Alignment.CenterVertically,
         horizontalArrangement = Arrangement.SpaceBetween,
     ) {
-        Text(label)
+        Text(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/navigation/BottomNavBar.kt

@@ -6,18 +6,33 @@ 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 = MaterialTheme.colorScheme.background,
+        containerColor = if (!showBottomBar) Color.Transparent else MaterialTheme.colorScheme.background,
     ) {
-        bottomNavItems.forEach { item ->
+        if (showBottomBar) bottomNavItems.forEach { item ->
             val selected = item.route == backStackEntry.value?.destination?.route
 
             NavigationBarItem(

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

@@ -21,26 +21,32 @@ fun AuthorizationPrompt(onSuccess: () -> Unit, onFailure: () -> Unit, onError: (
                 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
         }

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

@@ -19,12 +19,9 @@ 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
@@ -33,11 +30,11 @@ fun CustomSnackBar(
     isRtl: Boolean = true,
     containerColor: Color = MaterialTheme.colorScheme.surface
 ) {
-    val context = LocalContext.current
     Snackbar(
         containerColor = containerColor,
         modifier =
-            Modifier.fillMaxWidth(
+        Modifier
+            .fillMaxWidth(
                 if (WireGuardAutoTunnel.isRunningOnAndroidTv()) 1 / 3f else 2 / 3f,
             )
             .padding(bottom = 100.dp),
@@ -47,13 +44,16 @@ fun CustomSnackBar(
             LocalLayoutDirection provides if (isRtl) LayoutDirection.Rtl else LayoutDirection.Ltr,
         ) {
             Row(
-                modifier = Modifier.width(IntrinsicSize.Max).height(IntrinsicSize.Min),
+                modifier = Modifier
+                    .width(IntrinsicSize.Max)
+                    .height(IntrinsicSize.Min),
                 verticalAlignment = Alignment.CenterVertically,
                 horizontalArrangement = Arrangement.Start,
             ) {
+                val icon = Icons.Rounded.Info
                 Icon(
-                    Icons.Rounded.Info,
+                    icon,
-                    contentDescription = stringResource(R.string.info),
+                    contentDescription = icon.name,
                     tint = Color.White,
                     modifier = Modifier.padding(end = 10.dp),
                 )

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

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

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

@@ -0,0 +1,25 @@
+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.Center,
+        textAlign = TextAlign.Start,
         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

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

@@ -1,73 +0,0 @@
-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")
-    }
-}

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

@@ -1,7 +1,6 @@
 package com.zaneschepke.wireguardautotunnel.ui.screens.config
 
 import android.annotation.SuppressLint
-import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.focusGroup
@@ -29,7 +28,7 @@ import androidx.compose.material.icons.rounded.ContentCopy
 import androidx.compose.material.icons.rounded.Delete
 import androidx.compose.material.icons.rounded.Refresh
 import androidx.compose.material.icons.rounded.Save
-import androidx.compose.material3.AlertDialog
+import androidx.compose.material3.BasicAlertDialog
 import androidx.compose.material3.Checkbox
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.FabPosition
@@ -51,7 +50,6 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
-import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.focus.focusRequester
@@ -63,6 +61,7 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalSoftwareKeyboardController
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.text.buildAnnotatedString
 import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.text.input.PasswordVisualTransformation
 import androidx.compose.ui.text.input.VisualTransformation
@@ -73,30 +72,30 @@ import androidx.navigation.NavController
 import com.google.accompanist.drawablepainter.DrawablePainter
 import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.WireGuardAutoTunnel
+import com.zaneschepke.wireguardautotunnel.ui.AppViewModel
 import com.zaneschepke.wireguardautotunnel.ui.Screen
 import com.zaneschepke.wireguardautotunnel.ui.common.SearchBar
 import com.zaneschepke.wireguardautotunnel.ui.common.config.ConfigurationTextBox
 import com.zaneschepke.wireguardautotunnel.ui.common.prompt.AuthorizationPrompt
 import com.zaneschepke.wireguardautotunnel.ui.common.screen.LoadingScreen
 import com.zaneschepke.wireguardautotunnel.ui.common.text.SectionTitle
+import com.zaneschepke.wireguardautotunnel.ui.screens.main.ConfigType
 import com.zaneschepke.wireguardautotunnel.util.Constants
-import com.zaneschepke.wireguardautotunnel.util.Event
+import com.zaneschepke.wireguardautotunnel.util.getMessage
-import com.zaneschepke.wireguardautotunnel.util.Result
 import kotlinx.coroutines.delay
 
 @SuppressLint("UnusedMaterial3ScaffoldPaddingParameter")
 @OptIn(
-    ExperimentalComposeUiApi::class,
     ExperimentalMaterial3Api::class,
-    ExperimentalFoundationApi::class,
 )
 @Composable
 fun ConfigScreen(
     viewModel: ConfigViewModel = hiltViewModel(),
     focusRequester: FocusRequester,
     navController: NavController,
-    showSnackbarMessage: (String) -> Unit,
+    appViewModel: AppViewModel,
-    id: String
+    tunnelId: String,
+    configType: ConfigType
 ) {
     val context = LocalContext.current
     val clipboardManager: ClipboardManager = LocalClipboardManager.current
@@ -107,7 +106,7 @@ fun ConfigScreen(
 
     val uiState by viewModel.uiState.collectAsStateWithLifecycle()
 
-    LaunchedEffect(Unit) { viewModel.init(id) }
+    LaunchedEffect(Unit) { viewModel.init(tunnelId) }
 
     LaunchedEffect(uiState.loading) {
         if (!uiState.loading && WireGuardAutoTunnel.isRunningOnAndroidTv()) {
@@ -129,13 +128,16 @@ fun ConfigScreen(
     val fillMaxWidth = .85f
     val screenPadding = 5.dp
 
-    val applicationButtonText = {
+    val applicationButtonText = buildAnnotatedString {
-        "Tunneling apps: " +
+        append(stringResource(id = R.string.tunneling_apps))
+        append(": ")
         if (uiState.isAllApplicationsEnabled) {
-                "all"
+            append(stringResource(id = R.string.all))
         } else {
-                "${uiState.checkedPackageNames.size} " +
+            append("${uiState.checkedPackageNames.size} ")
-                    (if (uiState.include) "included" else "excluded")
+            (if (uiState.include) append(stringResource(id = R.string.included)) else append(
+                stringResource(id = R.string.excluded),
+            ))
         }
     }
 
@@ -145,13 +147,13 @@ fun ConfigScreen(
                 showAuthPrompt = false
                 isAuthenticated = true
             },
-            onError = { error ->
+            onError = {
                 showAuthPrompt = false
-                showSnackbarMessage(Event.Error.AuthenticationFailed.message)
+                appViewModel.showSnackbarMessage(context.getString(R.string.error_authentication_failed))
             },
             onFailure = {
                 showAuthPrompt = false
-                showSnackbarMessage(Event.Error.AuthorizationFailed.message)
+                appViewModel.showSnackbarMessage(context.getString(R.string.error_authorization_failed))
             },
         )
     }
@@ -161,20 +163,26 @@ fun ConfigScreen(
             remember(uiState.packages) {
                 uiState.packages.sortedBy { viewModel.getPackageLabel(it) }
             }
-        AlertDialog(onDismissRequest = { showApplicationsDialog = false }) {
+        BasicAlertDialog(onDismissRequest = { showApplicationsDialog = false }) {
             Surface(
                 tonalElevation = 2.dp,
                 shadowElevation = 2.dp,
                 shape = RoundedCornerShape(12.dp),
                 color = MaterialTheme.colorScheme.surface,
                 modifier =
-                    Modifier.fillMaxWidth()
+                Modifier
+                    .fillMaxWidth()
                     .fillMaxHeight(if (uiState.isAllApplicationsEnabled) 1 / 5f else 4 / 5f),
             ) {
-                Column(modifier = Modifier.fillMaxWidth()) {
+                Column(
+                    modifier = Modifier
+                        .fillMaxWidth(),
+                ) {
                     Row(
                         modifier =
-                            Modifier.fillMaxWidth().padding(horizontal = 20.dp, vertical = 7.dp),
+                        Modifier
+                            .fillMaxWidth()
+                            .padding(horizontal = 20.dp, vertical = 7.dp),
                         verticalAlignment = Alignment.CenterVertically,
                         horizontalArrangement = Arrangement.SpaceBetween,
                     ) {
@@ -187,7 +195,8 @@ fun ConfigScreen(
                     if (!uiState.isAllApplicationsEnabled) {
                         Row(
                             modifier =
-                                Modifier.fillMaxWidth()
+                            Modifier
+                                .fillMaxWidth()
                                 .padding(horizontal = 20.dp, vertical = 7.dp),
                             verticalAlignment = Alignment.CenterVertically,
                             horizontalArrangement = Arrangement.SpaceBetween,
@@ -219,7 +228,8 @@ fun ConfigScreen(
                         }
                         Row(
                             modifier =
-                                Modifier.fillMaxWidth()
+                            Modifier
+                                .fillMaxWidth()
                                 .padding(horizontal = 20.dp, vertical = 7.dp),
                             verticalAlignment = Alignment.CenterVertically,
                             horizontalArrangement = Arrangement.SpaceBetween,
@@ -236,7 +246,9 @@ fun ConfigScreen(
                                 Row(
                                     verticalAlignment = Alignment.CenterVertically,
                                     horizontalArrangement = Arrangement.SpaceBetween,
-                                    modifier = Modifier.fillMaxSize().padding(5.dp),
+                                    modifier = Modifier
+                                        .fillMaxSize()
+                                        .padding(5.dp),
                                 ) {
                                     Row(modifier = Modifier.fillMaxWidth(fillMaxWidth)) {
                                         val drawable =
@@ -248,9 +260,10 @@ fun ConfigScreen(
                                                 modifier = Modifier.size(50.dp, 50.dp),
                                             )
                                         } else {
+                                            val icon = Icons.Rounded.Android
                                             Icon(
-                                                Icons.Rounded.Android,
+                                                icon,
-                                                stringResource(id = R.string.edit),
+                                                icon.name,
                                                 modifier = Modifier.size(50.dp, 50.dp),
                                             )
                                         }
@@ -263,7 +276,7 @@ fun ConfigScreen(
                                         modifier = Modifier.fillMaxSize(),
                                         checked =
                                         (uiState.checkedPackageNames.contains(
-                                                pack.packageName
+                                            pack.packageName,
                                         )),
                                         onCheckedChange = {
                                             if (it) {
@@ -279,7 +292,9 @@ fun ConfigScreen(
                     }
                     Row(
                         verticalAlignment = Alignment.CenterVertically,
-                        modifier = Modifier.fillMaxSize().padding(top = 5.dp),
+                        modifier = Modifier
+                            .fillMaxSize()
+                            .padding(top = 5.dp),
                         horizontalArrangement = Arrangement.Center,
                     ) {
                         TextButton(onClick = { showApplicationsDialog = false }) {
@@ -299,20 +314,17 @@ fun ConfigScreen(
             var fobColor by remember { mutableStateOf(secondaryColor) }
             FloatingActionButton(
                 modifier =
-                    Modifier.padding(bottom = 90.dp).onFocusChanged {
+                Modifier.onFocusChanged {
                     if (WireGuardAutoTunnel.isRunningOnAndroidTv()) {
                         fobColor = if (it.isFocused) hoverColor else secondaryColor
                     }
                 },
                 onClick = {
-                    viewModel.onSaveAllChanges().let {
+                    viewModel.onSaveAllChanges(configType).onSuccess {
-                        when (it) {
+                        appViewModel.showSnackbarMessage(context.getString(R.string.config_changes_saved))
-                            is Result.Success -> {
-                                showSnackbarMessage(it.data.message)
                         navController.navigate(Screen.Main.route)
-                            }
+                    }.onFailure {
-                            is Result.Error -> showSnackbarMessage(it.error.message)
+                        appViewModel.showSnackbarMessage(it.getMessage(context))
-                        }
                     }
                 },
                 containerColor = fobColor,
@@ -331,7 +343,10 @@ fun ConfigScreen(
                 horizontalAlignment = Alignment.CenterHorizontally,
                 verticalArrangement = Arrangement.Top,
                 modifier =
-                    Modifier.verticalScroll(rememberScrollState()).weight(1f, true).fillMaxSize(),
+                Modifier
+                    .verticalScroll(rememberScrollState())
+                    .weight(1f, true)
+                    .fillMaxSize(),
             ) {
                 Surface(
                     tonalElevation = 2.dp,
@@ -340,16 +355,20 @@ fun ConfigScreen(
                     color = MaterialTheme.colorScheme.surface,
                     modifier =
                     (if (WireGuardAutoTunnel.isRunningOnAndroidTv()) {
-                                Modifier.fillMaxHeight(fillMaxHeight).fillMaxWidth(fillMaxWidth)
+                        Modifier
+                            .fillMaxHeight(fillMaxHeight)
+                            .fillMaxWidth(fillMaxWidth)
                     } else {
                         Modifier.fillMaxWidth(fillMaxWidth)
                     })
-                            .padding(top = 50.dp, bottom = 10.dp),
+                        .padding(bottom = 10.dp),
                 ) {
                     Column(
                         horizontalAlignment = Alignment.Start,
                         verticalArrangement = Arrangement.Top,
-                        modifier = Modifier.padding(15.dp).focusGroup(),
+                        modifier = Modifier
+                            .padding(15.dp)
+                            .focusGroup(),
                     ) {
                         SectionTitle(
                             stringResource(R.string.interface_),
@@ -361,16 +380,20 @@ fun ConfigScreen(
                             keyboardActions = keyboardActions,
                             label = stringResource(R.string.name),
                             hint = stringResource(R.string.tunnel_name).lowercase(),
-                            modifier = Modifier.fillMaxWidth().focusRequester(focusRequester),
+                            modifier = Modifier
+                                .fillMaxWidth()
+                                .focusRequester(focusRequester),
                         )
                         OutlinedTextField(
-                            modifier = Modifier.fillMaxWidth().clickable { showAuthPrompt = true },
+                            modifier = Modifier
+                                .fillMaxWidth()
+                                .clickable { showAuthPrompt = true },
                             value = uiState.interfaceProxy.privateKey,
                             visualTransformation =
-                                if ((id == Constants.MANUAL_TUNNEL_CONFIG_ID) || isAuthenticated)
+                            if ((tunnelId == Constants.MANUAL_TUNNEL_CONFIG_ID) || isAuthenticated)
                                 VisualTransformation.None
                             else PasswordVisualTransformation(),
-                            enabled = (id == Constants.MANUAL_TUNNEL_CONFIG_ID) || isAuthenticated,
+                            enabled = (tunnelId == Constants.MANUAL_TUNNEL_CONFIG_ID) || isAuthenticated,
                             onValueChange = { value -> viewModel.onPrivateKeyChange(value) },
                             trailingIcon = {
                                 IconButton(
@@ -392,7 +415,9 @@ fun ConfigScreen(
                         )
                         OutlinedTextField(
                             modifier =
-                                Modifier.fillMaxWidth().focusRequester(FocusRequester.Default),
+                            Modifier
+                                .fillMaxWidth()
+                                .focusRequester(FocusRequester.Default),
                             value = uiState.interfaceProxy.publicKey,
                             enabled = false,
                             onValueChange = {},
@@ -425,7 +450,9 @@ fun ConfigScreen(
                                 keyboardActions = keyboardActions,
                                 label = stringResource(R.string.addresses),
                                 hint = stringResource(R.string.comma_separated_list),
-                                modifier = Modifier.fillMaxWidth(3 / 5f).padding(end = 5.dp),
+                                modifier = Modifier
+                                    .fillMaxWidth(3 / 5f)
+                                    .padding(end = 5.dp),
                             )
                             ConfigurationTextBox(
                                 value = uiState.interfaceProxy.listenPort,
@@ -443,7 +470,9 @@ fun ConfigScreen(
                                 keyboardActions = keyboardActions,
                                 label = stringResource(R.string.dns_servers),
                                 hint = stringResource(R.string.comma_separated_list),
-                                modifier = Modifier.fillMaxWidth(3 / 5f).padding(end = 5.dp),
+                                modifier = Modifier
+                                    .fillMaxWidth(3 / 5f)
+                                    .padding(end = 5.dp),
                             )
                             ConfigurationTextBox(
                                 value = uiState.interfaceProxy.mtu,
@@ -454,13 +483,107 @@ fun ConfigScreen(
                                 modifier = Modifier.width(IntrinsicSize.Min),
                             )
                         }
+                        if(configType == ConfigType.AMNEZIA) {
+                            ConfigurationTextBox(
+                                value = uiState.interfaceProxy.junkPacketCount,
+                                onValueChange = { value -> viewModel.onJunkPacketCountChanged(value) },
+                                keyboardActions = keyboardActions,
+                                label = stringResource(R.string.junk_packet_count),
+                                hint = stringResource(R.string.junk_packet_count).lowercase(),
+                                modifier = Modifier
+                                    .fillMaxWidth()
+                                    .focusRequester(focusRequester),
+                            )
+                            ConfigurationTextBox(
+                                value = uiState.interfaceProxy.junkPacketMinSize,
+                                onValueChange = { value -> viewModel.onJunkPacketMinSizeChanged(value) },
+                                keyboardActions = keyboardActions,
+                                label = stringResource(R.string.junk_packet_minimum_size),
+                                hint = stringResource(R.string.junk_packet_minimum_size).lowercase(),
+                                modifier = Modifier
+                                    .fillMaxWidth()
+                                    .focusRequester(focusRequester),
+                            )
+                            ConfigurationTextBox(
+                                value = uiState.interfaceProxy.junkPacketMaxSize,
+                                onValueChange = { value -> viewModel.onJunkPacketMaxSizeChanged(value) },
+                                keyboardActions = keyboardActions,
+                                label = stringResource(R.string.junk_packet_maximum_size),
+                                hint = stringResource(R.string.junk_packet_maximum_size).lowercase(),
+                                modifier = Modifier
+                                    .fillMaxWidth()
+                                    .focusRequester(focusRequester),
+                            )
+                            ConfigurationTextBox(
+                                value = uiState.interfaceProxy.initPacketJunkSize,
+                                onValueChange = { value -> viewModel.onInitPacketJunkSizeChanged(value) },
+                                keyboardActions = keyboardActions,
+                                label = stringResource(R.string.init_packet_junk_size),
+                                hint = stringResource(R.string.init_packet_junk_size).lowercase(),
+                                modifier = Modifier
+                                    .fillMaxWidth()
+                                    .focusRequester(focusRequester),
+                            )
+                            ConfigurationTextBox(
+                                value = uiState.interfaceProxy.responsePacketJunkSize,
+                                onValueChange = { value -> viewModel.onResponsePacketJunkSize(value) },
+                                keyboardActions = keyboardActions,
+                                label = stringResource(R.string.response_packet_junk_size),
+                                hint = stringResource(R.string.response_packet_junk_size).lowercase(),
+                                modifier = Modifier
+                                    .fillMaxWidth()
+                                    .focusRequester(focusRequester),
+                            )
+                            ConfigurationTextBox(
+                                value = uiState.interfaceProxy.initPacketMagicHeader,
+                                onValueChange = { value -> viewModel.onInitPacketMagicHeader(value) },
+                                keyboardActions = keyboardActions,
+                                label = stringResource(R.string.init_packet_magic_header),
+                                hint = stringResource(R.string.init_packet_magic_header).lowercase(),
+                                modifier = Modifier
+                                    .fillMaxWidth()
+                                    .focusRequester(focusRequester),
+                            )
+                            ConfigurationTextBox(
+                                value = uiState.interfaceProxy.responsePacketMagicHeader,
+                                onValueChange = { value -> viewModel.onResponsePacketMagicHeader(value) },
+                                keyboardActions = keyboardActions,
+                                label = stringResource(R.string.response_packet_magic_header),
+                                hint = stringResource(R.string.response_packet_magic_header).lowercase(),
+                                modifier = Modifier
+                                    .fillMaxWidth()
+                                    .focusRequester(focusRequester),
+                            )
+                            ConfigurationTextBox(
+                                value = uiState.interfaceProxy.underloadPacketMagicHeader,
+                                onValueChange = { value -> viewModel.onUnderloadPacketMagicHeader(value) },
+                                keyboardActions = keyboardActions,
+                                label = stringResource(R.string.underload_packet_magic_header),
+                                hint = stringResource(R.string.underload_packet_magic_header).lowercase(),
+                                modifier = Modifier
+                                    .fillMaxWidth()
+                                    .focusRequester(focusRequester),
+                            )
+                            ConfigurationTextBox(
+                                value = uiState.interfaceProxy.transportPacketMagicHeader,
+                                onValueChange = { value -> viewModel.onTransportPacketMagicHeader(value) },
+                                keyboardActions = keyboardActions,
+                                label = stringResource(R.string.transport_packet_magic_header),
+                                hint = stringResource(R.string.transport_packet_magic_header).lowercase(),
+                                modifier = Modifier
+                                    .fillMaxWidth()
+                                    .focusRequester(focusRequester),
+                            )
+                        }
                         Row(
                             verticalAlignment = Alignment.CenterVertically,
-                            modifier = Modifier.fillMaxSize().padding(top = 5.dp),
+                            modifier = Modifier
+                                .fillMaxSize()
+                                .padding(top = 5.dp),
                             horizontalArrangement = Arrangement.Center,
                         ) {
                             TextButton(onClick = { showApplicationsDialog = true }) {
-                                Text(applicationButtonText())
+                                Text(applicationButtonText.text)
                             }
                         }
                     }
@@ -473,7 +596,9 @@ fun ConfigScreen(
                         color = MaterialTheme.colorScheme.surface,
                         modifier =
                         (if (WireGuardAutoTunnel.isRunningOnAndroidTv()) {
-                                    Modifier.fillMaxHeight(fillMaxHeight).fillMaxWidth(fillMaxWidth)
+                            Modifier
+                                .fillMaxHeight(fillMaxHeight)
+                                .fillMaxWidth(fillMaxWidth)
                         } else {
                             Modifier.fillMaxWidth(fillMaxWidth)
                         })
@@ -482,19 +607,24 @@ fun ConfigScreen(
                         Column(
                             horizontalAlignment = Alignment.Start,
                             verticalArrangement = Arrangement.Top,
-                            modifier = Modifier.padding(horizontal = 15.dp).padding(bottom = 10.dp),
+                            modifier = Modifier
+                                .padding(horizontal = 15.dp)
+                                .padding(bottom = 10.dp),
                         ) {
                             Row(
                                 horizontalArrangement = Arrangement.SpaceBetween,
                                 verticalAlignment = Alignment.CenterVertically,
-                                modifier = Modifier.fillMaxWidth().padding(horizontal = 5.dp),
+                                modifier = Modifier
+                                    .fillMaxWidth()
+                                    .padding(horizontal = 5.dp),
                             ) {
                                 SectionTitle(
                                     stringResource(R.string.peer),
                                     padding = screenPadding,
                                 )
                                 IconButton(onClick = { viewModel.onDeletePeer(index) }) {
-                                    Icon(Icons.Rounded.Delete, stringResource(R.string.delete))
+                                    val icon = Icons.Rounded.Delete
+                                    Icon(icon, icon.name)
                                 }
                             }
 
@@ -570,7 +700,9 @@ fun ConfigScreen(
                 Row(
                     horizontalArrangement = Arrangement.SpaceEvenly,
                     verticalAlignment = Alignment.CenterVertically,
-                    modifier = Modifier.fillMaxSize().padding(bottom = 140.dp),
+                    modifier = Modifier
+                        .fillMaxSize()
+                        .padding(bottom = 140.dp),
                 ) {
                     Row(
                         verticalAlignment = Alignment.CenterVertically,

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

@@ -1,8 +1,9 @@
 package com.zaneschepke.wireguardautotunnel.ui.screens.config
 
-import com.zaneschepke.wireguardautotunnel.data.model.TunnelConfig
+import com.wireguard.config.Config
-import com.zaneschepke.wireguardautotunnel.ui.models.InterfaceProxy
+import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
-import com.zaneschepke.wireguardautotunnel.ui.models.PeerProxy
+import com.zaneschepke.wireguardautotunnel.ui.screens.config.model.InterfaceProxy
+import com.zaneschepke.wireguardautotunnel.ui.screens.config.model.PeerProxy
 import com.zaneschepke.wireguardautotunnel.util.Packages
 
 data class ConfigUiState(
@@ -14,5 +15,58 @@ data class ConfigUiState(
     val isAllApplicationsEnabled: Boolean = false,
     val loading: Boolean = true,
     val tunnel: TunnelConfig? = null,
-    val tunnelName: String = ""
+    val tunnelName: String = "",
-)
+    val isAmneziaEnabled: Boolean = false
+) {
+    companion object {
+        fun from(config : Config) : ConfigUiState {
+            val proxyPeers = config.peers.map { PeerProxy.from(it) }
+            val proxyInterface = InterfaceProxy.from(config.`interface`)
+            var include = true
+            var isAllApplicationsEnabled = false
+            val checkedPackages =
+                if (config.`interface`.includedApplications.isNotEmpty()) {
+                    config.`interface`.includedApplications
+                } else if (config.`interface`.excludedApplications.isNotEmpty()) {
+                    include = false
+                    config.`interface`.excludedApplications
+                } else {
+                    isAllApplicationsEnabled = true
+                    emptySet()
+                }
+            return ConfigUiState(
+                proxyPeers,
+                proxyInterface,
+                emptyList(),
+                checkedPackages.toList(),
+                include,
+                isAllApplicationsEnabled,
+            )
+        }
+        fun from(config: org.amnezia.awg.config.Config) : ConfigUiState {
+            //TODO update with new values
+            val proxyPeers = config.peers.map { PeerProxy.from(it) }
+            val proxyInterface = InterfaceProxy.from(config.`interface`)
+            var include = true
+            var isAllApplicationsEnabled = false
+            val checkedPackages =
+                if (config.`interface`.includedApplications.isNotEmpty()) {
+                    config.`interface`.includedApplications
+                } else if (config.`interface`.excludedApplications.isNotEmpty()) {
+                    include = false
+                    config.`interface`.excludedApplications
+                } else {
+                    isAllApplicationsEnabled = true
+                    emptySet()
+                }
+            return ConfigUiState(
+                proxyPeers,
+                proxyInterface,
+                emptyList(),
+                checkedPackages.toList(),
+                include,
+                isAllApplicationsEnabled,
+            )
+        }
+    }
+}

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

@@ -1,7 +1,6 @@
 package com.zaneschepke.wireguardautotunnel.ui.screens.config
 
 import android.Manifest
-import android.app.Application
 import android.content.pm.PackageInfo
 import android.content.pm.PackageManager
 import android.os.Build
@@ -12,36 +11,37 @@ import com.wireguard.config.Interface
 import com.wireguard.config.Peer
 import com.wireguard.crypto.Key
 import com.wireguard.crypto.KeyPair
+import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.WireGuardAutoTunnel
-import com.zaneschepke.wireguardautotunnel.data.model.TunnelConfig
+import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
+import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
 import com.zaneschepke.wireguardautotunnel.data.repository.SettingsRepository
-import com.zaneschepke.wireguardautotunnel.data.repository.TunnelConfigRepository
+import com.zaneschepke.wireguardautotunnel.ui.screens.config.model.PeerProxy
-import com.zaneschepke.wireguardautotunnel.ui.models.InterfaceProxy
+import com.zaneschepke.wireguardautotunnel.ui.screens.main.ConfigType
-import com.zaneschepke.wireguardautotunnel.ui.models.PeerProxy
 import com.zaneschepke.wireguardautotunnel.util.Constants
-import com.zaneschepke.wireguardautotunnel.util.Event
 import com.zaneschepke.wireguardautotunnel.util.NumberUtils
-import com.zaneschepke.wireguardautotunnel.util.Result
+import com.zaneschepke.wireguardautotunnel.util.StringValue
+import com.zaneschepke.wireguardautotunnel.util.WgTunnelExceptions
 import com.zaneschepke.wireguardautotunnel.util.removeAt
 import com.zaneschepke.wireguardautotunnel.util.update
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
-import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
+import timber.log.Timber
 import javax.inject.Inject
 
 @HiltViewModel
 class ConfigViewModel
 @Inject
 constructor(
-    private val application: Application,
-    private val tunnelConfigRepository: TunnelConfigRepository,
     private val settingsRepository: SettingsRepository,
+    private val appDataRepository: AppDataRepository
 ) : ViewModel() {
 
-    private val packageManager = application.packageManager
+    private val packageManager = WireGuardAutoTunnel.instance.packageManager
 
     private val _uiState = MutableStateFlow(ConfigUiState())
     val uiState = _uiState.asStateFlow()
@@ -52,33 +52,19 @@ constructor(
             val state =
                 if (tunnelId != Constants.MANUAL_TUNNEL_CONFIG_ID) {
                     val tunnelConfig =
-                        tunnelConfigRepository.getAll().firstOrNull { it.id.toString() == tunnelId }
+                        appDataRepository.tunnels.getAll()
+                            .firstOrNull { it.id.toString() == tunnelId }
+                    val isAmneziaEnabled = settingsRepository.getSettings().isAmneziaEnabled
                     if (tunnelConfig != null) {
-                        val config = TunnelConfig.configFromQuick(tunnelConfig.wgQuick)
+                        (if(isAmneziaEnabled) {
-                        val proxyPeers = config.peers.map { PeerProxy.from(it) }
+                            val amConfig = if(tunnelConfig.amQuick == "") tunnelConfig.wgQuick else tunnelConfig.amQuick
-                        val proxyInterface = InterfaceProxy.from(config.`interface`)
+                            ConfigUiState.from(TunnelConfig.configFromAmQuick(amConfig))
-                        var include = true
+                        } else ConfigUiState.from(TunnelConfig.configFromWgQuick(tunnelConfig.wgQuick))).copy(
-                        var isAllApplicationsEnabled = false
+                            packages = packages,
-                        val checkedPackages =
+                            loading = false,
-                            if (config.`interface`.includedApplications.isNotEmpty()) {
+                            tunnel = tunnelConfig,
-                                config.`interface`.includedApplications
+                            tunnelName = tunnelConfig.name,
-                            } else if (config.`interface`.excludedApplications.isNotEmpty()) {
+                            isAmneziaEnabled = isAmneziaEnabled
-                                include = false
-                                config.`interface`.excludedApplications
-                            } else {
-                                isAllApplicationsEnabled = true
-                                emptySet()
-                            }
-                        ConfigUiState(
-                            proxyPeers,
-                            proxyInterface,
-                            packages,
-                            checkedPackages.toList(),
-                            include,
-                            isAllApplicationsEnabled,
-                            false,
-                            tunnelConfig,
-                            tunnelConfig.name,
                         )
                     } else {
                         ConfigUiState(loading = false, packages = packages)
@@ -100,7 +86,7 @@ constructor(
     fun onAddCheckedPackage(packageName: String) {
         _uiState.value =
             _uiState.value.copy(
-                checkedPackageNames = _uiState.value.checkedPackageNames + packageName
+                checkedPackageNames = _uiState.value.checkedPackageNames + packageName,
             )
     }
 
@@ -111,7 +97,7 @@ constructor(
     fun onRemoveCheckedPackage(packageName: String) {
         _uiState.value =
             _uiState.value.copy(
-                checkedPackageNames = _uiState.value.checkedPackageNames - packageName
+                checkedPackageNames = _uiState.value.checkedPackageNames - packageName,
             )
     }
 
@@ -122,7 +108,7 @@ constructor(
     }
 
     fun getPackageLabel(packageInfo: PackageInfo): String {
-        return packageInfo.applicationInfo.loadLabel(application.packageManager).toString()
+        return packageInfo.applicationInfo.loadLabel(packageManager).toString()
     }
 
     private fun getAllInternetCapablePackages(): List<PackageInfo> {
@@ -145,23 +131,13 @@ constructor(
     }
 
     private fun saveConfig(tunnelConfig: TunnelConfig) =
-        viewModelScope.launch { tunnelConfigRepository.save(tunnelConfig) }
+        viewModelScope.launch { appDataRepository.tunnels.save(tunnelConfig) }
 
     private fun updateTunnelConfig(tunnelConfig: TunnelConfig?) =
         viewModelScope.launch {
             if (tunnelConfig != null) {
                 saveConfig(tunnelConfig).join()
-                WireGuardAutoTunnel.requestTileServiceStateUpdate()
+                WireGuardAutoTunnel.requestTunnelTileServiceStateUpdate()
-                updateSettingsDefaultTunnel(tunnelConfig)
-            }
-        }
-
-    private suspend fun updateSettingsDefaultTunnel(tunnelConfig: TunnelConfig) {
-        val settings = settingsRepository.getSettingsFlow().first()
-        if (settings.defaultTunnel != null) {
-            if (tunnelConfig.id == TunnelConfig.from(settings.defaultTunnel!!).id) {
-                settingsRepository.save(settings.copy(defaultTunnel = tunnelConfig.toString()))
-            }
             }
         }
 
@@ -179,6 +155,20 @@ constructor(
         }
     }
 
+    private fun buildAmPeerListFromProxyPeers(): List<org.amnezia.awg.config.Peer> {
+        return _uiState.value.proxyPeers.map {
+            val builder = org.amnezia.awg.config.Peer.Builder()
+            if (it.allowedIps.isNotEmpty()) builder.parseAllowedIPs(it.allowedIps.trim())
+            if (it.publicKey.isNotEmpty()) builder.parsePublicKey(it.publicKey.trim())
+            if (it.preSharedKey.isNotEmpty()) builder.parsePreSharedKey(it.preSharedKey.trim())
+            if (it.endpoint.isNotEmpty()) builder.parseEndpoint(it.endpoint.trim())
+            if (it.persistentKeepalive.isNotEmpty()) {
+                builder.parsePersistentKeepalive(it.persistentKeepalive.trim())
+            }
+            builder.build()
+        }
+    }
+
     private fun emptyCheckedPackagesList() {
         _uiState.value = _uiState.value.copy(checkedPackageNames = emptyList())
     }
@@ -201,28 +191,96 @@ constructor(
         return builder.build()
     }
 
-    fun onSaveAllChanges(): Result<Event> {
+    private fun buildAmInterfaceListFromProxyInterface(): org.amnezia.awg.config.Interface {
-        return try {
+        val builder = org.amnezia.awg.config.Interface.Builder()
+        builder.parsePrivateKey(_uiState.value.interfaceProxy.privateKey.trim())
+        builder.parseAddresses(_uiState.value.interfaceProxy.addresses.trim())
+        if (_uiState.value.interfaceProxy.dnsServers.isNotEmpty()) {
+            builder.parseDnsServers(_uiState.value.interfaceProxy.dnsServers.trim())
+        }
+        if (_uiState.value.interfaceProxy.mtu.isNotEmpty())
+            builder.parseMtu(_uiState.value.interfaceProxy.mtu.trim())
+        if (_uiState.value.interfaceProxy.listenPort.isNotEmpty()) {
+            builder.parseListenPort(_uiState.value.interfaceProxy.listenPort.trim())
+        }
+        if (isAllApplicationsEnabled()) emptyCheckedPackagesList()
+        if (_uiState.value.include) builder.includeApplications(_uiState.value.checkedPackageNames)
+        if (!_uiState.value.include) builder.excludeApplications(_uiState.value.checkedPackageNames)
+        if(_uiState.value.interfaceProxy.junkPacketCount.isNotEmpty()) {
+            builder.setJunkPacketCount(_uiState.value.interfaceProxy.junkPacketCount.trim().toInt())
+        }
+        if(_uiState.value.interfaceProxy.junkPacketMinSize.isNotEmpty()) {
+            builder.setJunkPacketMinSize(_uiState.value.interfaceProxy.junkPacketMinSize.trim().toInt())
+        }
+        if(_uiState.value.interfaceProxy.junkPacketMaxSize.isNotEmpty()) {
+            builder.setJunkPacketMaxSize(_uiState.value.interfaceProxy.junkPacketMaxSize.trim().toInt())
+        }
+        if(_uiState.value.interfaceProxy.initPacketJunkSize.isNotEmpty()) {
+            builder.setInitPacketJunkSize(_uiState.value.interfaceProxy.initPacketJunkSize.trim().toInt())
+        }
+        if(_uiState.value.interfaceProxy.responsePacketJunkSize.isNotEmpty()) {
+            builder.setResponsePacketJunkSize(_uiState.value.interfaceProxy.responsePacketJunkSize.trim().toInt())
+        }
+        if(_uiState.value.interfaceProxy.initPacketMagicHeader.isNotEmpty()) {
+            builder.setInitPacketMagicHeader(_uiState.value.interfaceProxy.initPacketMagicHeader.trim().toLong())
+        }
+        if(_uiState.value.interfaceProxy.responsePacketMagicHeader.isNotEmpty()) {
+            builder.setResponsePacketMagicHeader(_uiState.value.interfaceProxy.responsePacketMagicHeader.trim().toLong())
+        }
+        if(_uiState.value.interfaceProxy.transportPacketMagicHeader.isNotEmpty()) {
+            builder.setTransportPacketMagicHeader(_uiState.value.interfaceProxy.transportPacketMagicHeader.trim().toLong())
+        }
+        if(_uiState.value.interfaceProxy.underloadPacketMagicHeader.isNotEmpty()) {
+            builder.setUnderloadPacketMagicHeader(_uiState.value.interfaceProxy.underloadPacketMagicHeader.trim().toLong())
+        }
+        return builder.build()
+    }
+
+    private fun buildConfig() : Config {
         val peerList = buildPeerListFromProxyPeers()
         val wgInterface = buildInterfaceListFromProxyInterface()
-            val config = Config.Builder().addPeers(peerList).setInterface(wgInterface).build()
+        return  Config.Builder().addPeers(peerList).setInterface(wgInterface).build()
-            val tunnelConfig = when(uiState.value.tunnel) {
+    }
-                null -> TunnelConfig(name = _uiState.value.tunnelName, wgQuick = config.toWgQuickString())
+
+    private fun buildAmConfig() : org.amnezia.awg.config.Config {
+        val peerList = buildAmPeerListFromProxyPeers()
+        val amInterface = buildAmInterfaceListFromProxyInterface()
+        return org.amnezia.awg.config.Config.Builder().addPeers(peerList).setInterface(amInterface).build()
+    }
+
+    fun onSaveAllChanges(configType: ConfigType): Result<Unit> {
+        return try {
+            val wgQuick = buildConfig().toWgQuickString()
+            val amQuick = if(configType == ConfigType.AMNEZIA) {
+                buildAmConfig().toAwgQuickString()
+            } else TunnelConfig.AM_QUICK_DEFAULT
+            val tunnelConfig = when (uiState.value.tunnel) {
+                null -> TunnelConfig(
+                    name = _uiState.value.tunnelName,
+                    wgQuick = wgQuick,
+                    amQuick = amQuick
+                )
                 else -> uiState.value.tunnel!!.copy(
                     name = _uiState.value.tunnelName,
-                    wgQuick = config.toWgQuickString(),
+                    wgQuick = wgQuick,
+                    amQuick = amQuick
                 )
             }
             updateTunnelConfig(tunnelConfig)
-            Result.Success(Event.Message.ConfigSaved)
+            Result.success(Unit)
         } catch (e: Exception) {
-            Result.Error(Event.Error.Exception(e))
+            Timber.e(e)
+            val message = e.message?.substringAfter(":", missingDelimiterValue = "")
+            val stringValue = message?.let {
+                StringValue.DynamicString(message)
+            } ?: StringValue.StringResource(R.string.unknown_error)
+            Result.failure(WgTunnelExceptions.ConfigParseError(stringValue))
         }
     }
 
     fun onPeerPublicKeyChange(index: Int, value: String) {
-        _uiState.value =
+        _uiState.update {
-            _uiState.value.copy(
+            it.copy(
                 proxyPeers =
                 _uiState.value.proxyPeers.update(
                     index,
@@ -230,10 +288,11 @@ constructor(
                 ),
             )
         }
+    }
 
     fun onPreSharedKeyChange(index: Int, value: String) {
-        _uiState.value =
+        _uiState.update {
-            _uiState.value.copy(
+            it.copy(
                 proxyPeers =
                 _uiState.value.proxyPeers.update(
                     index,
@@ -241,10 +300,11 @@ constructor(
                 ),
             )
         }
+    }
 
     fun onEndpointChange(index: Int, value: String) {
-        _uiState.value =
+        _uiState.update {
-            _uiState.value.copy(
+            it.copy(
                 proxyPeers =
                 _uiState.value.proxyPeers.update(
                     index,
@@ -252,10 +312,11 @@ constructor(
                 ),
             )
         }
+    }
 
     fun onAllowedIpsChange(index: Int, value: String) {
-        _uiState.value =
+        _uiState.update {
-            _uiState.value.copy(
+            it.copy(
                 proxyPeers =
                 _uiState.value.proxyPeers.update(
                     index,
@@ -263,10 +324,11 @@ constructor(
                 ),
             )
         }
+    }
 
     fun onPersistentKeepaliveChanged(index: Int, value: String) {
-        _uiState.value =
+        _uiState.update {
-            _uiState.value.copy(
+            it.copy(
                 proxyPeers =
                 _uiState.value.proxyPeers.update(
                     index,
@@ -274,22 +336,26 @@ constructor(
                 ),
             )
         }
+    }
 
     fun onDeletePeer(index: Int) {
-        _uiState.value =
+        _uiState.update {
-            _uiState.value.copy(
+            it.copy(
                 proxyPeers = _uiState.value.proxyPeers.removeAt(index),
             )
         }
+    }
 
     fun addEmptyPeer() {
-        _uiState.value = _uiState.value.copy(proxyPeers = _uiState.value.proxyPeers + PeerProxy())
+        _uiState.update {
+            it.copy(proxyPeers = _uiState.value.proxyPeers + PeerProxy())
+        }
     }
 
     fun generateKeyPair() {
         val keyPair = KeyPair()
-        _uiState.value =
+        _uiState.update {
-            _uiState.value.copy(
+            it.copy(
                 interfaceProxy =
                 _uiState.value.interfaceProxy.copy(
                     privateKey = keyPair.privateKey.toBase64(),
@@ -297,45 +363,54 @@ constructor(
                 ),
             )
         }
+    }
 
     fun onAddressesChanged(value: String) {
-        _uiState.value =
+        _uiState.update {
-            _uiState.value.copy(
+            it.copy(
-                interfaceProxy = _uiState.value.interfaceProxy.copy(addresses = value)
+                interfaceProxy = _uiState.value.interfaceProxy.copy(addresses = value),
             )
         }
 
+    }
+
     fun onListenPortChanged(value: String) {
-        _uiState.value =
+        _uiState.update {
-            _uiState.value.copy(
+            it.copy(
-                interfaceProxy = _uiState.value.interfaceProxy.copy(listenPort = value)
+                interfaceProxy = _uiState.value.interfaceProxy.copy(listenPort = value),
             )
         }
+    }
 
     fun onDnsServersChanged(value: String) {
-        _uiState.value =
+        _uiState.update {
-            _uiState.value.copy(
+            it.copy(
-                interfaceProxy = _uiState.value.interfaceProxy.copy(dnsServers = value)
+                interfaceProxy = _uiState.value.interfaceProxy.copy(dnsServers = value),
             )
         }
+    }
 
     fun onMtuChanged(value: String) {
-        _uiState.value =
+        _uiState.update {
-            _uiState.value.copy(interfaceProxy = _uiState.value.interfaceProxy.copy(mtu = value))
+            it.copy(interfaceProxy = _uiState.value.interfaceProxy.copy(mtu = value))
+        }
     }
 
     private fun onInterfacePublicKeyChange(value: String) {
-        _uiState.value =
+        _uiState.update {
-            _uiState.value.copy(
+            it.copy(
-                interfaceProxy = _uiState.value.interfaceProxy.copy(publicKey = value)
+                interfaceProxy = _uiState.value.interfaceProxy.copy(publicKey = value),
             )
         }
 
+    }
+
     fun onPrivateKeyChange(value: String) {
-        _uiState.value =
+        _uiState.update {
-            _uiState.value.copy(
+            it.copy(
-                interfaceProxy = _uiState.value.interfaceProxy.copy(privateKey = value)
+                interfaceProxy = _uiState.value.interfaceProxy.copy(privateKey = value),
             )
+        }
         if (NumberUtils.isValidKey(value)) {
             val pair = KeyPair(Key.fromBase64(value))
             onInterfacePublicKeyChange(pair.publicKey.toBase64())
@@ -349,6 +424,77 @@ constructor(
             getAllInternetCapablePackages().filter {
                 getPackageLabel(it).lowercase().contains(query.lowercase())
             }
-        _uiState.value = _uiState.value.copy(packages = packages)
+        _uiState.update { it.copy(packages = packages) }
+    }
+
+    fun onJunkPacketCountChanged(value: String) {
+        _uiState.update {
+            it.copy(
+                interfaceProxy = _uiState.value.interfaceProxy.copy(junkPacketCount = value)
+            )
+        }
+    }
+    fun onJunkPacketMinSizeChanged(value: String) {
+        _uiState.update {
+            it.copy(
+                interfaceProxy = _uiState.value.interfaceProxy.copy(junkPacketMinSize = value)
+            )
+        }
+    }
+
+    fun onJunkPacketMaxSizeChanged(value: String) {
+        _uiState.update {
+            it.copy(
+                interfaceProxy = _uiState.value.interfaceProxy.copy(junkPacketMaxSize = value)
+            )
+        }
+    }
+
+    fun onInitPacketJunkSizeChanged(value: String) {
+        _uiState.update {
+            it.copy(
+                interfaceProxy = _uiState.value.interfaceProxy.copy(initPacketJunkSize = value)
+            )
+        }
+    }
+
+    fun onResponsePacketJunkSize(value: String) {
+        _uiState.update {
+            it.copy(
+                interfaceProxy = _uiState.value.interfaceProxy.copy(responsePacketJunkSize = value)
+            )
+        }
+    }
+
+    fun onInitPacketMagicHeader(value: String) {
+        _uiState.update {
+            it.copy(
+                interfaceProxy = _uiState.value.interfaceProxy.copy(initPacketMagicHeader = value)
+            )
+        }
+    }
+
+    fun onResponsePacketMagicHeader(value: String) {
+        _uiState.update {
+            it.copy(
+                interfaceProxy = _uiState.value.interfaceProxy.copy(responsePacketMagicHeader = value)
+            )
+        }
+    }
+
+    fun onTransportPacketMagicHeader(value: String) {
+        _uiState.update {
+            it.copy(
+                interfaceProxy = _uiState.value.interfaceProxy.copy(transportPacketMagicHeader = value)
+            )
+        }
+    }
+
+    fun onUnderloadPacketMagicHeader(value: String) {
+        _uiState.update {
+            it.copy(
+                interfaceProxy = _uiState.value.interfaceProxy.copy(underloadPacketMagicHeader = value)
+            )
+        }
     }
 }

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

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

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

@@ -0,0 +1,98 @@
+package com.zaneschepke.wireguardautotunnel.ui.screens.config.model
+
+import com.wireguard.config.Peer
+
+data class PeerProxy(
+    val publicKey: String = "",
+    val preSharedKey: String = "",
+    val persistentKeepalive: String = "",
+    val endpoint: String = "",
+    val 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(),
+            )
+        }
+
+        fun from(peer: org.amnezia.awg.config.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")
+    }
+}

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

@@ -0,0 +1,6 @@
+package com.zaneschepke.wireguardautotunnel.ui.screens.main
+
+enum class ConfigType {
+    AMNEZIA,
+    WIREGUARD
+}

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

@@ -19,45 +19,41 @@ import androidx.compose.foundation.gestures.ScrollableDefaults
 import androidx.compose.foundation.gestures.detectTapGestures
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.requiredWidth
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.foundation.overscroll
 import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.text.ClickableText
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Create
 import androidx.compose.material.icons.filled.FileOpen
 import androidx.compose.material.icons.filled.QrCode
-import androidx.compose.material.icons.rounded.Add
 import androidx.compose.material.icons.rounded.Bolt
 import androidx.compose.material.icons.rounded.Circle
+import androidx.compose.material.icons.rounded.CopyAll
 import androidx.compose.material.icons.rounded.Delete
-import androidx.compose.material.icons.rounded.Edit
 import androidx.compose.material.icons.rounded.Info
+import androidx.compose.material.icons.rounded.Settings
+import androidx.compose.material.icons.rounded.Smartphone
 import androidx.compose.material.icons.rounded.Star
 import androidx.compose.material3.AlertDialog
-import androidx.compose.material3.Divider
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.FabPosition
-import androidx.compose.material3.FloatingActionButton
+import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.MaterialTheme.typography
 import androidx.compose.material3.ModalBottomSheet
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Switch
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextButton
-import androidx.compose.material3.TopAppBar
 import androidx.compose.material3.rememberModalBottomSheetState
 import androidx.compose.material3.surfaceColorAtElevation
 import androidx.compose.runtime.Composable
@@ -74,25 +70,37 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.focus.focusRequester
 import androidx.compose.ui.focus.onFocusChanged
+import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.hapticfeedback.HapticFeedbackType
+import androidx.compose.ui.input.nestedscroll.NestedScrollConnection
+import androidx.compose.ui.input.nestedscroll.NestedScrollSource
+import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.input.pointer.pointerInput
-import androidx.compose.ui.platform.LocalConfiguration
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalHapticFeedback
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.SpanStyle
+import androidx.compose.ui.text.buildAnnotatedString
 import androidx.compose.ui.text.font.FontStyle
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.text.withStyle
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.navigation.NavController
+import com.iamageo.multifablibrary.FabIcon
+import com.iamageo.multifablibrary.FabOption
+import com.iamageo.multifablibrary.MultiFabItem
+import com.iamageo.multifablibrary.MultiFloatingActionButton
 import com.journeyapps.barcodescanner.ScanContract
 import com.journeyapps.barcodescanner.ScanOptions
-import com.wireguard.android.backend.Tunnel
 import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.WireGuardAutoTunnel
-import com.zaneschepke.wireguardautotunnel.data.model.TunnelConfig
+import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
 import com.zaneschepke.wireguardautotunnel.service.tunnel.HandshakeStatus
+import com.zaneschepke.wireguardautotunnel.service.tunnel.TunnelState
+import com.zaneschepke.wireguardautotunnel.ui.AppViewModel
 import com.zaneschepke.wireguardautotunnel.ui.CaptureActivityPortrait
 import com.zaneschepke.wireguardautotunnel.ui.Screen
 import com.zaneschepke.wireguardautotunnel.ui.common.RowListItem
@@ -100,23 +108,21 @@ import com.zaneschepke.wireguardautotunnel.ui.common.screen.LoadingScreen
 import com.zaneschepke.wireguardautotunnel.ui.theme.corn
 import com.zaneschepke.wireguardautotunnel.ui.theme.mint
 import com.zaneschepke.wireguardautotunnel.util.Constants
-import com.zaneschepke.wireguardautotunnel.util.Event
+import com.zaneschepke.wireguardautotunnel.util.getMessage
-import com.zaneschepke.wireguardautotunnel.util.Result
 import com.zaneschepke.wireguardautotunnel.util.handshakeStatus
 import com.zaneschepke.wireguardautotunnel.util.mapPeerStats
+import com.zaneschepke.wireguardautotunnel.util.truncateWithEllipsis
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
-import timber.log.Timber
 
 @SuppressLint("UnusedMaterial3ScaffoldPaddingParameter")
 @OptIn(ExperimentalMaterial3Api::class, ExperimentalFoundationApi::class)
 @Composable
 fun MainScreen(
     viewModel: MainViewModel = hiltViewModel(),
-    padding: PaddingValues,
+    appViewModel: AppViewModel,
     focusRequester: FocusRequester,
-    showSnackbarMessage: (String) -> Unit,
     navController: NavController
 ) {
     val haptic = LocalHapticFeedback.current
@@ -126,24 +132,38 @@ fun MainScreen(
 
     val sheetState = rememberModalBottomSheetState()
     var showBottomSheet by remember { mutableStateOf(false) }
+    var configType by remember { mutableStateOf(ConfigType.WIREGUARD) }
+
+    // Nested scroll for control FAB
+    val nestedScrollConnection = remember {
+        object : NestedScrollConnection {
+            override fun onPreScroll(available: Offset, source: NestedScrollSource): Offset {
+                // Hide FAB
+                if (available.y < -1) {
+                    isVisible.value = false
+                }
+                // Show FAB
+                if (available.y > 1) {
+                    isVisible.value = true
+                }
+
+                return Offset.Zero
+            }
+        }
+    }
+
 
-    var showPrimaryChangeAlertDialog by remember { mutableStateOf(false) }
     var showDeleteTunnelAlertDialog by remember { mutableStateOf(false) }
     var selectedTunnel by remember { mutableStateOf<TunnelConfig?>(null) }
     val uiState by viewModel.uiState.collectAsStateWithLifecycle()
 
-    LaunchedEffect(uiState.loading) {
+    LaunchedEffect(Unit) {
-        if (!uiState.loading && WireGuardAutoTunnel.isRunningOnAndroidTv()) {
+        if (WireGuardAutoTunnel.isRunningOnAndroidTv()) {
             delay(Constants.FOCUS_REQUEST_DELAY)
             focusRequester.requestFocus()
         }
     }
 
-    if (uiState.loading) {
-        LoadingScreen()
-        return
-    }
-
     val tunnelFileImportResultLauncher =
         rememberLauncherForActivityResult(
             object : ActivityResultContracts.GetContent() {
@@ -173,7 +193,7 @@ fun MainScreen(
                                 name.startsWith(Constants.ANDROID_TV_EXPLORER_STUB)
                         }
                     ) {
-                        showSnackbarMessage(Event.Error.FileExplorerRequired.message)
+                        appViewModel.showSnackbarMessage(context.getString(R.string.error_no_file_explorer))
                     }
                     return intent
                 }
@@ -181,11 +201,8 @@ fun MainScreen(
         ) { data ->
             if (data == null) return@rememberLauncherForActivityResult
             scope.launch {
-                viewModel.onTunnelFileSelected(data).let {
+                viewModel.onTunnelFileSelected(data, configType, context).onFailure {
-                    when (it) {
+                    appViewModel.showSnackbarMessage(it.getMessage(context))
-                        is Result.Error -> showSnackbarMessage(it.error.message)
-                        is Result.Success -> {}
-                    }
                 }
             }
         }
@@ -195,48 +212,21 @@ fun MainScreen(
             onResult = {
                 if (it.contents != null) {
                     scope.launch {
-                        viewModel.onTunnelQrResult(it.contents).let { result ->
+                        viewModel.onTunnelQrResult(it.contents, configType).onFailure {
-                            when (result) {
+                            appViewModel.showSnackbarMessage(it.getMessage(context))
-                                is Result.Success -> {}
-                                is Result.Error -> showSnackbarMessage(result.error.message)
-                            }
                         }
                     }
                 }
             },
         )
 
-    AnimatedVisibility(showPrimaryChangeAlertDialog) {
-        AlertDialog(
-            onDismissRequest = { showPrimaryChangeAlertDialog = false },
-            confirmButton = {
-                TextButton(
-                    onClick = {
-                        viewModel.onDefaultTunnelChange(selectedTunnel)
-                        showPrimaryChangeAlertDialog = false
-                        selectedTunnel = null
-                    },
-                ) {
-                    Text(text = stringResource(R.string.okay))
-                }
-            },
-            dismissButton = {
-                TextButton(onClick = { showPrimaryChangeAlertDialog = false }) {
-                    Text(text = stringResource(R.string.cancel))
-                }
-            },
-            title = { Text(text = stringResource(R.string.primary_tunnel_change)) },
-            text = { Text(text = stringResource(R.string.primary_tunnel_change_question)) },
-        )
-    }
-
     AnimatedVisibility(showDeleteTunnelAlertDialog) {
         AlertDialog(
             onDismissRequest = { showDeleteTunnelAlertDialog = false },
             confirmButton = {
                 TextButton(
                     onClick = {
-                        selectedTunnel?.let { viewModel.onDelete(it) }
+                        selectedTunnel?.let { viewModel.onDelete(it, context) }
                         showDeleteTunnelAlertDialog = false
                         selectedTunnel = null
                     },
@@ -255,63 +245,41 @@ fun MainScreen(
     }
 
     fun onTunnelToggle(checked: Boolean, tunnel: TunnelConfig) {
-        if (checked) viewModel.onTunnelStart(tunnel) else viewModel.onTunnelStop()
+        if (appViewModel.isRequiredPermissionGranted()) {
+            if (checked) viewModel.onTunnelStart(tunnel, context) else viewModel.onTunnelStop(context)
+        }
+    }
+
+    if (uiState.loading) {
+        return LoadingScreen()
+    }
+
+    fun launchQrScanner() {
+        val scanOptions = ScanOptions()
+        scanOptions.setDesiredBarcodeFormats(ScanOptions.QR_CODE)
+        scanOptions.setOrientationLocked(true)
+        scanOptions.setPrompt(
+            context.getString(R.string.scanning_qr),
+        )
+        scanOptions.setBeepEnabled(false)
+        scanOptions.captureActivity =
+            CaptureActivityPortrait::class.java
+        scanLauncher.launch(scanOptions)
     }
 
     Scaffold(
         modifier =
         Modifier.pointerInput(Unit) {
+            if(uiState.tunnels.isNotEmpty()) {
                 detectTapGestures(
                     onTap = {
-                        if (!WireGuardAutoTunnel.isRunningOnAndroidTv()) selectedTunnel = null
+                        selectedTunnel = null
                     },
                 )
+            }
+
         },
         floatingActionButtonPosition = FabPosition.End,
-        topBar = {
-            if (uiState.settings.isAutoTunnelEnabled)
-                TopAppBar(
-                    title = {
-                        Row(
-                            horizontalArrangement = Arrangement.SpaceBetween,
-                            verticalAlignment = Alignment.CenterVertically,
-                            modifier =
-                                Modifier.requiredWidth(LocalConfiguration.current.screenWidthDp.dp)
-                                    .padding(end = 5.dp),
-                        ) {
-                            Row {
-                                Icon(
-                                    Icons.Rounded.Bolt,
-                                    stringResource(id = R.string.auto),
-                                    modifier = Modifier.size(25.dp),
-                                    tint =
-                                        if (uiState.settings.isAutoTunnelPaused) Color.Gray
-                                        else mint,
-                                )
-                                Text(
-                                    "Auto-tunneling: ${if (uiState.settings.isAutoTunnelPaused) "paused" else "active"}",
-                                    style = typography.bodyLarge,
-                                    modifier = Modifier.padding(start = 10.dp),
-                                )
-                            }
-                            if (uiState.settings.isAutoTunnelPaused)
-                                TextButton(
-                                    onClick = { viewModel.resumeAutoTunneling() },
-                                    modifier = Modifier.padding(end = 10.dp),
-                                ) {
-                                    Text("Resume")
-                                }
-                            else
-                                TextButton(
-                                    onClick = { viewModel.pauseAutoTunneling() },
-                                    modifier = Modifier.padding(end = 10.dp),
-                                ) {
-                                    Text("Pause")
-                                }
-                        }
-                    },
-                )
-        },
         floatingActionButton = {
             AnimatedVisibility(
                 visible = isVisible.value,
@@ -321,7 +289,7 @@ fun MainScreen(
                 val secondaryColor = MaterialTheme.colorScheme.secondary
                 val hoverColor = MaterialTheme.colorScheme.surfaceColorAtElevation(2.dp)
                 var fobColor by remember { mutableStateOf(secondaryColor) }
-                FloatingActionButton(
+                MultiFloatingActionButton(
                     modifier =
                     (if (
                         WireGuardAutoTunnel.isRunningOnAndroidTv() &&
@@ -329,34 +297,50 @@ fun MainScreen(
                     )
                         Modifier.focusRequester(focusRequester)
                     else Modifier)
-                            .padding(bottom = 90.dp)
                         .onFocusChanged {
                             if (WireGuardAutoTunnel.isRunningOnAndroidTv()) {
                                 fobColor = if (it.isFocused) hoverColor else secondaryColor
                             }
                         },
-                    onClick = { showBottomSheet = true },
+                    fabIcon = FabIcon(
-                    containerColor = fobColor,
+                        iconRes = R.drawable.add,
+                        iconResAfterRotate = R.drawable.close,
+                        iconRotate = 180f
+                    ),
+                    fabOption = FabOption(
+                        iconTint = MaterialTheme.colorScheme.background,
+                        backgroundTint = MaterialTheme.colorScheme.primary,
+                    ),
+                    itemsMultiFab = listOf(
+                        MultiFabItem(
+                            label = {
+                                Text(
+                                    stringResource(id = R.string.amnezia),
+                                    color = Color.White,
+                                    textAlign = TextAlign.Center,
+                                    modifier = Modifier.padding(end = 10.dp)
+                                )
+                            },
+                            icon = R.drawable.add,
+                            value = ConfigType.AMNEZIA.name,
+                        ),
+                        MultiFabItem(
+                            label = {
+                                Text(stringResource(id = R.string.wireguard), color = Color.White, textAlign = TextAlign.Center, modifier = Modifier.padding(end = 10.dp))
+                            },
+                            icon = R.drawable.add,
+                            value = ConfigType.WIREGUARD.name
+                        ),
+                    ),
+                    onFabItemClicked = {
+                        showBottomSheet = true
+                        configType = ConfigType.valueOf(it.value)
+                       },
                     shape = RoundedCornerShape(16.dp),
-                ) {
-                    Icon(
-                        imageVector = Icons.Rounded.Add,
-                        contentDescription = stringResource(id = R.string.add_tunnel),
-                        tint = Color.DarkGray,
                 )
             }
-            }
         },
-    ) { innerPadding ->
-        AnimatedVisibility(uiState.tunnels.isEmpty(), exit = fadeOut(), enter = fadeIn()) {
-            Column(
-                horizontalAlignment = Alignment.CenterHorizontally,
-                verticalArrangement = Arrangement.Center,
-                modifier = Modifier.fillMaxSize().padding(padding),
     ) {
-                Text(text = stringResource(R.string.no_tunnels), fontStyle = FontStyle.Italic)
-            }
-        }
         if (showBottomSheet) {
             ModalBottomSheet(
                 onDismissRequest = { showBottomSheet = false },
@@ -365,7 +349,8 @@ fun MainScreen(
                 // Sheet content
                 Row(
                     modifier =
-                        Modifier.fillMaxWidth()
+                    Modifier
+                        .fillMaxWidth()
                         .clickable {
                             showBottomSheet = false
                             tunnelFileImportResultLauncher.launch(Constants.ALLOWED_FILE_TYPES)
@@ -383,23 +368,15 @@ fun MainScreen(
                     )
                 }
                 if (!WireGuardAutoTunnel.isRunningOnAndroidTv()) {
-                    Divider()
+                    HorizontalDivider()
                     Row(
                         modifier =
-                            Modifier.fillMaxWidth()
+                        Modifier
+                            .fillMaxWidth()
                             .clickable {
                                 scope.launch {
                                     showBottomSheet = false
-                                        val scanOptions = ScanOptions()
+                                    launchQrScanner()
-                                        scanOptions.setDesiredBarcodeFormats(ScanOptions.QR_CODE)
-                                        scanOptions.setOrientationLocked(true)
-                                        scanOptions.setPrompt(
-                                            context.getString(R.string.scanning_qr)
-                                        )
-                                        scanOptions.setBeepEnabled(false)
-                                        scanOptions.captureActivity =
-                                            CaptureActivityPortrait::class.java
-                                        scanLauncher.launch(scanOptions)
                                 }
                             }
                             .padding(10.dp),
@@ -415,14 +392,15 @@ fun MainScreen(
                         )
                     }
                 }
-                Divider()
+                HorizontalDivider()
                 Row(
                     modifier =
-                        Modifier.fillMaxWidth()
+                    Modifier
+                        .fillMaxWidth()
                         .clickable {
                             showBottomSheet = false
                             navController.navigate(
-                                    "${Screen.Config.route}/${Constants.MANUAL_TUNNEL_CONFIG_ID}",
+                                "${Screen.Config.route}/${Constants.MANUAL_TUNNEL_CONFIG_ID}?configType=${configType}",
                             )
                         }
                         .padding(10.dp),
@@ -444,23 +422,104 @@ fun MainScreen(
             horizontalAlignment = Alignment.Start,
             verticalArrangement = Arrangement.Top,
             modifier =
-                Modifier.fillMaxWidth()
+            Modifier
-                    .fillMaxHeight(.90f)
+                .fillMaxSize()
                 .overscroll(ScrollableDefaults.overscrollEffect())
-                    .padding(innerPadding),
+                .nestedScroll(nestedScrollConnection),
             state = rememberLazyListState(0, uiState.tunnels.count()),
             userScrollEnabled = true,
-            reverseLayout = true,
+            reverseLayout = false,
             flingBehavior = ScrollableDefaults.flingBehavior(),
         ) {
+            item {
+                val gettingStarted = buildAnnotatedString {
+                    append(stringResource(id = R.string.see_the))
+                    append(" ")
+                    pushStringAnnotation(tag = "gettingStarted", annotation = stringResource(id = R.string.getting_started_url))
+                    withStyle(style = SpanStyle(color = MaterialTheme.colorScheme.primary)) {
+                        append(stringResource(id = R.string.getting_started_guide))
+                    }
+                    pop()
+                    append(" ")
+                    append(stringResource(R.string.unsure_how))
+                    append(".")
+                }
+                AnimatedVisibility(
+                    uiState.tunnels.isEmpty(), exit = fadeOut(), enter = fadeIn()) {
+                    Column(
+                        horizontalAlignment = Alignment.CenterHorizontally,
+                        verticalArrangement = Arrangement.Center,
+                        modifier = Modifier.padding(top = 100.dp)
+                    ) {
+                        Text(text = stringResource(R.string.no_tunnels), fontStyle = FontStyle.Italic)
+                        ClickableText(
+                            modifier = Modifier.padding(vertical = 10.dp, horizontal = 24.dp),
+                            text = gettingStarted,
+                            style = MaterialTheme.typography.bodyMedium.copy(color = MaterialTheme.colorScheme.onSurfaceVariant, textAlign = TextAlign.Center),
+                        ) {
+                            gettingStarted.getStringAnnotations(tag = "gettingStarted", it, it).firstOrNull()?.let { annotation ->
+                                appViewModel.openWebPage(annotation.item, context)
+                            }
+                        }
+                    }
+                }
+            }
+            item {
+                if (uiState.settings.isAutoTunnelEnabled) {
+                    val autoTunnelingLabel = buildAnnotatedString {
+                        append(stringResource(id = R.string.auto_tunneling))
+                        append(": ")
+                        if (uiState.settings.isAutoTunnelPaused) append(
+                            stringResource(id = R.string.paused),
+                        ) else append(
+                            stringResource(id = R.string.active),
+                        )
+                    }
+                    RowListItem(
+                        icon = {
+                            val icon = Icons.Rounded.Bolt
+                            Icon(
+                                icon,
+                                icon.name,
+                                modifier = Modifier
+                                    .padding(end = 8.5.dp)
+                                    .size(25.dp),
+                                tint =
+                                if (uiState.settings.isAutoTunnelPaused) Color.Gray
+                                else mint,
+                            )
+                        },
+                        text = autoTunnelingLabel.text,
+                        rowButton = {
+                            if (uiState.settings.isAutoTunnelPaused) {
+                                TextButton(
+                                    onClick = { viewModel.resumeAutoTunneling() },
+                                ) {
+                                    Text(stringResource(id = R.string.resume))
+                                }
+                            } else {
+                                TextButton(
+                                    onClick = { viewModel.pauseAutoTunneling() },
+                                ) {
+                                    Text(stringResource(id = R.string.pause))
+                                }
+                            }
+                        },
+                        onClick = {},
+                        onHold = {},
+                        expanded = false,
+                        statistics = null,
+                    )
+                }
+            }
             items(
                 uiState.tunnels,
                 key = { tunnel -> tunnel.id },
             ) { tunnel ->
                 val leadingIconColor =
                     (if (
-                        uiState.vpnState.name == tunnel.name &&
+                        uiState.vpnState.tunnelConfig?.name == tunnel.name &&
-                            uiState.vpnState.status == Tunnel.State.UP
+                        uiState.vpnState.status == TunnelState.UP
                     ) {
                         uiState.vpnState.statistics
                             ?.mapPeerStats()
@@ -471,6 +530,7 @@ fun MainScreen(
                                     statuses?.any { it == HandshakeStatus.STALE } == true -> corn
                                     statuses?.all { it == HandshakeStatus.NOT_STARTED } == true ->
                                         Color.Gray
+
                                     else -> {
                                         Color.Gray
                                     }
@@ -482,29 +542,33 @@ fun MainScreen(
                 val expanded = remember { mutableStateOf(false) }
                 RowListItem(
                     icon = {
-                        if (uiState.settings.isTunnelConfigDefault(tunnel)) {
+                        val circleIcon = Icons.Rounded.Circle
-                            Icon(
+                        val icon = if (tunnel.isPrimaryTunnel) {
-                                Icons.Rounded.Star,
+                            Icons.Rounded.Star
-                                stringResource(R.string.status),
+                        } else if (tunnel.isMobileDataTunnel) {
-                                tint = leadingIconColor,
+                            Icons.Rounded.Smartphone
-                                modifier = Modifier.padding(end = 10.dp).size(20.dp),
-                            )
                         } else {
-                            Icon(
+                            circleIcon
-                                Icons.Rounded.Circle,
-                                stringResource(R.string.status),
-                                tint = leadingIconColor,
-                                modifier = Modifier.padding(end = 15.dp).size(15.dp),
-                            )
                         }
+                        Icon(
+                            icon,
+                            icon.name,
+                            tint = leadingIconColor,
+                            modifier = Modifier
+                                .padding(
+                                    end = if (icon == circleIcon) 12.5.dp else 10.dp,
+                                    start = if (icon == circleIcon) 2.5.dp else 0.dp,
+                                )
+                                .size(if (icon == circleIcon) 15.dp else 20.dp),
+                        )
                     },
-                    text = tunnel.name,
+                    text = tunnel.name.truncateWithEllipsis(Constants.ALLOWED_DISPLAY_NAME_LENGTH),
                     onHold = {
                         if (
-                            (uiState.vpnState.status == Tunnel.State.UP) &&
+                            (uiState.vpnState.status == TunnelState.UP) &&
-                                (tunnel.name == uiState.vpnState.name)
+                            (tunnel.name == uiState.vpnState.tunnelConfig?.name)
                         ) {
-                            showSnackbarMessage(Event.Message.TunnelOffAction.message)
+                            appViewModel.showSnackbarMessage(context.getString(R.string.turn_off_tunnel))
                             return@RowListItem
                         }
                         haptic.performHapticFeedback(HapticFeedbackType.LongPress)
@@ -513,8 +577,8 @@ fun MainScreen(
                     onClick = {
                         if (!WireGuardAutoTunnel.isRunningOnAndroidTv()) {
                             if (
-                                uiState.vpnState.status == Tunnel.State.UP &&
+                                uiState.vpnState.status == TunnelState.UP &&
-                                    (uiState.vpnState.name == tunnel.name)
+                                (uiState.vpnState.tunnelConfig?.name == tunnel.name)
                             ) {
                                 expanded.value = !expanded.value
                             }
@@ -531,59 +595,48 @@ fun MainScreen(
                             !WireGuardAutoTunnel.isRunningOnAndroidTv()
                         ) {
                             Row {
-                                if (!uiState.settings.isTunnelConfigDefault(tunnel)) {
                                 IconButton(
                                     onClick = {
                                         if (
                                             uiState.settings.isAutoTunnelEnabled &&
                                             !uiState.settings.isAutoTunnelPaused
                                         ) {
-                                                showSnackbarMessage(
+                                            appViewModel.showSnackbarMessage(
-                                                    Event.Message.AutoTunnelOffAction.message,
+                                                context.getString(R.string.turn_off_tunnel),
                                             )
                                         } else {
-                                                showPrimaryChangeAlertDialog = true
+                                            navController.navigate(
+                                                "${Screen.Option.route}/${selectedTunnel?.id}",
+                                            )
                                         }
                                     },
                                 ) {
+                                    val icon = Icons.Rounded.Settings
                                     Icon(
-                                            Icons.Rounded.Star,
+                                        icon,
-                                            stringResource(id = R.string.set_primary),
+                                        icon.name,
                                     )
                                 }
-                                }
                                 IconButton(
-                                    onClick = {
+                                    modifier = Modifier.focusable(),
-                                        if (
+                                    onClick = { viewModel.onCopyTunnel(selectedTunnel) },
-                                            uiState.settings.isAutoTunnelEnabled &&
-                                                uiState.settings.isTunnelConfigDefault(
-                                                    tunnel,
-                                                ) &&
-                                                !uiState.settings.isAutoTunnelPaused
                                 ) {
-                                            showSnackbarMessage(
+                                    val icon = Icons.Rounded.CopyAll
-                                                Event.Message.AutoTunnelOffAction.message,
+                                    Icon(icon, icon.name)
-                                            )
-                                        } else
-                                            navController.navigate(
-                                                "${Screen.Config.route}/${selectedTunnel?.id}",
-                                            )
-                                    },
-                                ) {
-                                    Icon(Icons.Rounded.Edit, stringResource(id = R.string.edit))
                                 }
                                 IconButton(
                                     modifier = Modifier.focusable(),
                                     onClick = { showDeleteTunnelAlertDialog = true },
                                 ) {
-                                    Icon(Icons.Rounded.Delete, stringResource(id = R.string.delete))
+                                    val icon = Icons.Rounded.Delete
+                                    Icon(icon, icon.name)
                                 }
                             }
                         } else {
                             val checked by remember {
                                 derivedStateOf {
-                                    (uiState.vpnState.status == Tunnel.State.UP &&
+                                    (uiState.vpnState.status == TunnelState.UP &&
-                                        tunnel.name == uiState.vpnState.name)
+                                        tunnel.name == uiState.vpnState.tunnelConfig?.name)
                                 }
                             }
                             if (!checked) expanded.value = false
@@ -600,77 +653,69 @@ fun MainScreen(
                                 )
                             if (WireGuardAutoTunnel.isRunningOnAndroidTv()) {
                                 Row {
-                                    if (!uiState.settings.isTunnelConfigDefault(tunnel)) {
                                     IconButton(
                                         onClick = {
                                             if (uiState.settings.isAutoTunnelEnabled) {
-                                                    showSnackbarMessage(
+                                                appViewModel.showSnackbarMessage(
-                                                        Event.Message.AutoTunnelOffAction.message,
+                                                    context.getString(R.string.turn_off_auto),
                                                 )
                                             } else {
                                                 selectedTunnel = tunnel
-                                                    showPrimaryChangeAlertDialog = true
+                                                navController.navigate(
+                                                    "${Screen.Option.route}/${selectedTunnel?.id}",
+                                                )
                                             }
                                         },
                                     ) {
+                                        val icon = Icons.Rounded.Settings
                                         Icon(
-                                                Icons.Rounded.Star,
+                                            icon,
-                                                stringResource(id = R.string.set_primary),
+                                            icon.name,
                                         )
                                     }
-                                    }
                                     IconButton(
                                         modifier = Modifier.focusRequester(focusRequester),
                                         onClick = {
                                             if (
-                                                uiState.vpnState.status == Tunnel.State.UP &&
+                                                uiState.vpnState.status == TunnelState.UP &&
-                                                    (uiState.vpnState.name == tunnel.name)
+                                                (uiState.vpnState.tunnelConfig?.name == tunnel.name)
                                             ) {
                                                 expanded.value = !expanded.value
                                             } else {
-                                                showSnackbarMessage(
+                                                appViewModel.showSnackbarMessage(
-                                                    Event.Message.TunnelOnAction.message
+                                                    context.getString(R.string.turn_on_tunnel),
                                                 )
                                             }
                                         },
                                     ) {
-                                        Icon(Icons.Rounded.Info, stringResource(R.string.info))
+                                        val icon = Icons.Rounded.Info
+                                        Icon(icon, icon.name)
+                                    }
+                                    IconButton(
+                                        onClick = { viewModel.onCopyTunnel(tunnel) },
+                                    ) {
+                                        val icon = Icons.Rounded.CopyAll
+                                        Icon(icon, icon.name)
                                     }
                                     IconButton(
                                         onClick = {
                                             if (
-                                                uiState.vpnState.status == Tunnel.State.UP &&
+                                                uiState.vpnState.status == TunnelState.UP &&
-                                                    tunnel.name == uiState.vpnState.name
+                                                tunnel.name == uiState.vpnState.tunnelConfig?.name
                                             ) {
-                                                showSnackbarMessage(
+                                                appViewModel.showSnackbarMessage(
-                                                    Event.Message.TunnelOffAction.message
+                                                    context.getString(R.string.turn_off_tunnel),
-                                                )
-                                            } else {
-                                                navController.navigate(
-                                                    "${Screen.Config.route}/${tunnel.id}",
-                                                )
-                                            }
-                                        },
-                                    ) {
-                                        Icon(Icons.Rounded.Edit, stringResource(id = R.string.edit))
-                                    }
-                                    IconButton(
-                                        onClick = {
-                                            if (
-                                                uiState.vpnState.status == Tunnel.State.UP &&
-                                                    tunnel.name == uiState.vpnState.name
-                                            ) {
-                                                showSnackbarMessage(
-                                                    Event.Message.TunnelOffAction.message
                                                 )
                                             } else {
+                                                selectedTunnel = tunnel
                                                 showDeleteTunnelAlertDialog = true
                                             }
                                         },
                                     ) {
+                                        val icon = Icons.Rounded.Delete
                                         Icon(
-                                            Icons.Rounded.Delete,
+                                            icon,
-                                            stringResource(id = R.string.delete),
+                                            icon.name,
                                         )
                                     }
                                     TunnelSwitch()

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

@@ -1,6 +1,6 @@
 package com.zaneschepke.wireguardautotunnel.ui.screens.main
 
-import com.zaneschepke.wireguardautotunnel.data.model.Settings
+import com.zaneschepke.wireguardautotunnel.data.domain.Settings
 import com.zaneschepke.wireguardautotunnel.service.tunnel.VpnState
 import com.zaneschepke.wireguardautotunnel.util.TunnelConfigs
 

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

@@ -1,6 +1,5 @@
 package com.zaneschepke.wireguardautotunnel.ui.screens.main
 
-import android.app.Application
 import android.content.Context
 import android.database.Cursor
 import android.net.Uri
@@ -9,20 +8,17 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.wireguard.config.Config
 import com.zaneschepke.wireguardautotunnel.WireGuardAutoTunnel
-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
-import com.zaneschepke.wireguardautotunnel.data.repository.SettingsRepository
+import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
-import com.zaneschepke.wireguardautotunnel.data.repository.TunnelConfigRepository
 import com.zaneschepke.wireguardautotunnel.service.foreground.ServiceManager
 import com.zaneschepke.wireguardautotunnel.service.tunnel.VpnService
 import com.zaneschepke.wireguardautotunnel.util.Constants
-import com.zaneschepke.wireguardautotunnel.util.Event
 import com.zaneschepke.wireguardautotunnel.util.NumberUtils
-import com.zaneschepke.wireguardautotunnel.util.Result
+import com.zaneschepke.wireguardautotunnel.util.WgTunnelExceptions
+import com.zaneschepke.wireguardautotunnel.util.toWgQuickString
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.async
-import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.stateIn
@@ -37,19 +33,17 @@ import javax.inject.Inject
 class MainViewModel
 @Inject
 constructor(
-    private val application: Application,
+    private val appDataRepository: AppDataRepository,
-    private val tunnelConfigRepository: TunnelConfigRepository,
+    private val serviceManager: ServiceManager,
-    private val settingsRepository: SettingsRepository,
+    val vpnService: VpnService
-    private val vpnService: VpnService
 ) : ViewModel() {
 
     val uiState =
         combine(
-                settingsRepository.getSettingsFlow(),
+            appDataRepository.settings.getSettingsFlow(),
-                tunnelConfigRepository.getTunnelConfigsFlow(),
+            appDataRepository.tunnels.getTunnelConfigsFlow(),
             vpnService.vpnState,
         ) { settings, tunnels, vpnState ->
-                validateWatcherServiceState(settings)
             MainUiState(settings, tunnels, vpnState, false)
         }
             .stateIn(
@@ -58,112 +52,160 @@ constructor(
                 MainUiState(),
             )
 
-    private fun validateWatcherServiceState(settings: Settings) =
+    private fun stopWatcherService(context: Context) =
         viewModelScope.launch(Dispatchers.IO) {
-            if (settings.isAutoTunnelEnabled) {
+            serviceManager.stopWatcherService(context)
-                ServiceManager.startWatcherService(application.applicationContext)
+        }
+
+    fun onDelete(tunnel: TunnelConfig, context: Context) {
+        viewModelScope.launch(Dispatchers.IO) {
+            val settings = appDataRepository.settings.getSettings()
+            val isPrimary = tunnel.isPrimaryTunnel
+            if (appDataRepository.tunnels.count() == 1 || isPrimary) {
+                stopWatcherService(context)
+                resetTunnelSetting(settings)
+            }
+            appDataRepository.tunnels.delete(tunnel)
+            WireGuardAutoTunnel.requestTunnelTileServiceStateUpdate()
         }
     }
 
-    private fun stopWatcherService() =
+    private fun resetTunnelSetting(settings: Settings) {
-        viewModelScope.launch(Dispatchers.IO) {
+        saveSettings(
-            ServiceManager.stopWatcherService(application.applicationContext)
+            settings.copy(
+                isAutoTunnelEnabled = false,
+                isAlwaysOnVpnEnabled = false,
+            ),
+        )
     }
 
-    fun onDelete(tunnel: TunnelConfig) {
+    fun onTunnelStart(tunnelConfig: TunnelConfig, context: Context) =
-        viewModelScope.launch(Dispatchers.IO) {
-            if (tunnelConfigRepository.count() == 1) {
-                stopWatcherService()
-                val settings = settingsRepository.getSettings()
-                settings.defaultTunnel = null
-                settings.isAutoTunnelEnabled = false
-                settings.isAlwaysOnVpnEnabled = false
-                saveSettings(settings)
-            }
-            tunnelConfigRepository.delete(tunnel)
-            WireGuardAutoTunnel.requestTileServiceStateUpdate()
-        }
-    }
-
-    fun onTunnelStart(tunnelConfig: TunnelConfig) =
         viewModelScope.launch(Dispatchers.IO) {
             Timber.d("On start called!")
-            stopActiveTunnel().await()
+            serviceManager.startVpnService(
-            startTunnel(tunnelConfig)
+                context,
+                tunnelConfig.id,
+                isManualStart = true,
+            )
         }
 
-    private fun startTunnel(tunnelConfig: TunnelConfig) =
+
+    fun onTunnelStop(context: Context) =
         viewModelScope.launch(Dispatchers.IO) {
-            Timber.d("Start tunnel via manager")
+            Timber.i("Stopping active tunnel")
-            ServiceManager.startVpnService(application.applicationContext, tunnelConfig.toString())
+            serviceManager.stopVpnService(context, isManualStop = true)
         }
 
-    private fun stopActiveTunnel() =
+    private fun validateConfigString(config: String, configType: ConfigType) {
-        viewModelScope.async(Dispatchers.IO) {
+        when(configType) {
-            onTunnelStop()
+            ConfigType.AMNEZIA -> TunnelConfig.configFromAmQuick(config)
-            delay(Constants.TOGGLE_TUNNEL_DELAY)
+            ConfigType.WIREGUARD -> TunnelConfig.configFromWgQuick(config)
+        }
     }
 
-    fun onTunnelStop() =
+    private fun generateQrCodeDefaultName(config : String, configType: ConfigType) : String {
-        viewModelScope.launch(Dispatchers.IO) {
-            Timber.d("Stopping active tunnel")
-            ServiceManager.stopVpnService(application.applicationContext)
-        }
-
-    private fun validateConfigString(config: String) {
-        TunnelConfig.configFromQuick(config)
-    }
-
-    suspend fun onTunnelQrResult(result: String): Result<Unit> {
         return try {
-            validateConfigString(result)
+            when(configType) {
-            val tunnelConfig =
+                ConfigType.AMNEZIA -> {
-                TunnelConfig(name = NumberUtils.generateRandomTunnelName(), wgQuick = result)
+                    TunnelConfig.configFromAmQuick(config).peers[0].endpoint.get().host
+                }
+                ConfigType.WIREGUARD -> {
+                    TunnelConfig.configFromWgQuick(config).peers[0].endpoint.get().host
+                }
+            }
+        } catch (e : Exception) {
+            Timber.e(e)
+            NumberUtils.generateRandomTunnelName()
+        }
+    }
+
+    private fun generateQrCodeTunnelName(config : String, configType: ConfigType) : String {
+        var defaultName = generateQrCodeDefaultName(config, configType)
+        val lines = config.lines().toMutableList()
+        val linesIterator = lines.iterator()
+        while(linesIterator.hasNext()) {
+            val next = linesIterator.next()
+            if(next.contains(Constants.QR_CODE_NAME_PROPERTY)) {
+                defaultName = next.substringAfter(Constants.QR_CODE_NAME_PROPERTY).trim()
+                break
+            }
+        }
+        return defaultName
+    }
+
+    suspend fun onTunnelQrResult(result: String, configType: ConfigType): Result<Unit> {
+        return try {
+            validateConfigString(result, configType)
+            val tunnelName = makeTunnelNameUnique(generateQrCodeTunnelName(result, configType))
+            val tunnelConfig = when(configType) {
+                ConfigType.AMNEZIA ->{
+                    TunnelConfig(name = tunnelName, amQuick = result,
+                        wgQuick = TunnelConfig.configFromAmQuick(result).toWgQuickString())
+                }
+                ConfigType.WIREGUARD -> TunnelConfig(name = tunnelName, wgQuick = result)
+            }
             addTunnel(tunnelConfig)
-            Result.Success(Unit)
+            Result.success(Unit)
         } catch (e: Exception) {
-            Result.Error(Event.Error.InvalidQrCode)
+            Timber.e(e)
+            Result.failure(WgTunnelExceptions.InvalidQrCode())
         }
     }
 
-    private suspend fun saveTunnelConfigFromStream(stream: InputStream, fileName: String) {
+    private suspend fun makeTunnelNameUnique(name : String) : String {
-        val bufferReader = stream.bufferedReader(charset = Charsets.UTF_8)
+        val tunnels = appDataRepository.tunnels.getAll()
-        val config = Config.parse(bufferReader)
+        var tunnelName = name
-        val tunnelName = getNameFromFileName(fileName)
+        var num = 1
-        addTunnel(TunnelConfig(name = tunnelName, wgQuick = config.toWgQuickString()))
+        while (tunnels.any { it.name == tunnelName }) {
-        withContext(Dispatchers.IO) { stream.close() }
+            tunnelName = name + "(${num})"
+            num++
+        }
+        return tunnelName
     }
 
-    private fun getInputStreamFromUri(uri: Uri): InputStream? {
+    private suspend fun saveTunnelConfigFromStream(stream: InputStream, fileName: String, type: ConfigType) {
-        return application.applicationContext.contentResolver.openInputStream(uri)
+        var amQuick : String? = null
+        val wgQuick = stream.use {
+            when(type) {
+                ConfigType.AMNEZIA -> {
+                    val config = org.amnezia.awg.config.Config.parse(it)
+                    amQuick = config.toAwgQuickString()
+                    config.toWgQuickString()
+                }
+                ConfigType.WIREGUARD -> {
+                    Config.parse(it).toWgQuickString()
+                }
+            }
+        }
+        val tunnelName = makeTunnelNameUnique(getNameFromFileName(fileName))
+        addTunnel(TunnelConfig(name = tunnelName, wgQuick = wgQuick, amQuick = amQuick ?: TunnelConfig.AM_QUICK_DEFAULT))
     }
 
-    suspend fun onTunnelFileSelected(uri: Uri): Result<Unit> {
+    private fun getInputStreamFromUri(uri: Uri, context: Context): InputStream? {
-        try {
+        return context.applicationContext.contentResolver.openInputStream(uri)
+    }
+
+    suspend fun onTunnelFileSelected(uri: Uri, configType: ConfigType, context: Context): Result<Unit> {
+        return try {
             if (isValidUriContentScheme(uri)) {
-                val fileName = getFileName(application.applicationContext, uri)
+                val fileName = getFileName(context, uri)
-                when (getFileExtensionFromFileName(fileName)) {
+                return when (getFileExtensionFromFileName(fileName)) {
                     Constants.CONF_FILE_EXTENSION ->
-                        saveTunnelFromConfUri(fileName, uri).let {
+                        saveTunnelFromConfUri(fileName, uri, configType, context)
-                            when (it) {
+                    Constants.ZIP_FILE_EXTENSION -> saveTunnelsFromZipUri(uri, configType, context)
-                                is Result.Error -> return Result.Error(Event.Error.FileReadFailed)
+                    else -> Result.failure(WgTunnelExceptions.InvalidFileExtension())
-                                is Result.Success -> return it
                 }
-                        }
-                    Constants.ZIP_FILE_EXTENSION -> saveTunnelsFromZipUri(uri)
-                    else -> return Result.Error(Event.Error.InvalidFileExtension)
-                }
-                return Result.Success(Unit)
             } else {
-                return Result.Error(Event.Error.InvalidFileExtension)
+                Result.failure(WgTunnelExceptions.InvalidFileExtension())
             }
         } catch (e: Exception) {
-            return Result.Error(Event.Error.FileReadFailed)
+            Timber.e(e)
+            Result.failure(WgTunnelExceptions.FileReadFailed())
         }
     }
 
-    private suspend fun saveTunnelsFromZipUri(uri: Uri) {
+    private suspend fun saveTunnelsFromZipUri(uri: Uri, configType: ConfigType, context: Context) : Result<Unit> {
-        ZipInputStream(getInputStreamFromUri(uri)).use { zip ->
+        return ZipInputStream(getInputStreamFromUri(uri, context)).use { zip ->
             generateSequence { zip.nextEntry }
                 .filterNot {
                     it.isDirectory ||
@@ -171,41 +213,61 @@ constructor(
                 }
                 .forEach {
                     val name = getNameFromFileName(it.name)
-                    val config = Config.parse(zip)
+                    withContext(viewModelScope.coroutineContext + Dispatchers.IO) {
-                    viewModelScope.launch(Dispatchers.IO) {
+                        try {
-                        addTunnel(TunnelConfig(name = name, wgQuick = config.toWgQuickString()))
+                            var amQuick : String? = null
+                            val wgQuick =
+                                when(configType) {
+                                    ConfigType.AMNEZIA -> {
+                                        val config = org.amnezia.awg.config.Config.parse(zip)
+                                        amQuick = config.toAwgQuickString()
+                                        config.toWgQuickString()
+                                    }
+                                    ConfigType.WIREGUARD -> {
+                                        Config.parse(zip).toWgQuickString()
                                     }
                                 }
+                            addTunnel(TunnelConfig(name = makeTunnelNameUnique(name), wgQuick = wgQuick, amQuick = amQuick ?: TunnelConfig.AM_QUICK_DEFAULT))
+                            Result.success(Unit)
+                        } catch (e : Exception) {
+                            Result.failure(WgTunnelExceptions.FileReadFailed())
+                        }
+                    }
+                }
+            Result.success(Unit)
         }
     }
 
-    private suspend fun saveTunnelFromConfUri(name: String, uri: Uri): Result<Unit> {
+    private suspend fun saveTunnelFromConfUri(name: String, uri: Uri, configType: ConfigType, context: Context): Result<Unit> {
-        val stream = getInputStreamFromUri(uri)
+        val stream = getInputStreamFromUri(uri, context)
         return if (stream != null) {
-            saveTunnelConfigFromStream(stream, name)
+            saveTunnelConfigFromStream(stream, name, configType)
-            Result.Success(Unit)
+            Result.success(Unit)
         } else {
-            Result.Error(Event.Error.FileReadFailed)
+            Result.failure(WgTunnelExceptions.FileReadFailed())
         }
     }
 
     private suspend fun addTunnel(tunnelConfig: TunnelConfig) {
+        val firstTunnel = appDataRepository.tunnels.count() == 0
         saveTunnel(tunnelConfig)
-        WireGuardAutoTunnel.requestTileServiceStateUpdate()
+        if (firstTunnel) WireGuardAutoTunnel.requestTunnelTileServiceStateUpdate()
     }
 
     fun pauseAutoTunneling() =
         viewModelScope.launch {
-            settingsRepository.save(uiState.value.settings.copy(isAutoTunnelPaused = true))
+            appDataRepository.settings.save(uiState.value.settings.copy(isAutoTunnelPaused = true))
+            WireGuardAutoTunnel.requestAutoTunnelTileServiceUpdate()
         }
 
     fun resumeAutoTunneling() =
         viewModelScope.launch {
-            settingsRepository.save(uiState.value.settings.copy(isAutoTunnelPaused = false))
+            appDataRepository.settings.save(uiState.value.settings.copy(isAutoTunnelPaused = false))
+            WireGuardAutoTunnel.requestAutoTunnelTileServiceUpdate()
         }
 
     private suspend fun saveTunnel(tunnelConfig: TunnelConfig) {
-        tunnelConfigRepository.save(tunnelConfig)
+        appDataRepository.tunnels.save(tunnelConfig)
     }
 
     private fun getFileNameByCursor(context: Context, uri: Uri): String? {
@@ -245,23 +307,27 @@ constructor(
         return fileName.substring(0, fileName.lastIndexOf('.'))
     }
 
-    private fun getFileExtensionFromFileName(fileName: String): String {
+    private fun getFileExtensionFromFileName(fileName: String): String? {
         return try {
             fileName.substring(fileName.lastIndexOf('.'))
         } catch (e: Exception) {
-            ""
+            Timber.e(e)
+            null
         }
     }
 
     private fun saveSettings(settings: Settings) =
-        viewModelScope.launch(Dispatchers.IO) { settingsRepository.save(settings) }
+        viewModelScope.launch(Dispatchers.IO) { appDataRepository.settings.save(settings) }
 
-    fun onDefaultTunnelChange(selectedTunnel: TunnelConfig?) =
+
-        viewModelScope.launch {
+    fun onCopyTunnel(tunnel: TunnelConfig?) = viewModelScope.launch {
-            if (selectedTunnel != null) {
+        tunnel?.let {
-                saveSettings(uiState.value.settings.copy(defaultTunnel = selectedTunnel.toString()))
+            saveTunnel(
-                    .join()
+                TunnelConfig(
-                WireGuardAutoTunnel.requestTileServiceStateUpdate()
+                    name = it.name.plus(NumberUtils.randomThree()),
+                    wgQuick = it.wgQuick,
+                ),
+            )
         }
     }
 }

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

@@ -0,0 +1,339 @@
+package com.zaneschepke.wireguardautotunnel.ui.screens.options
+
+import android.annotation.SuppressLint
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.interaction.MutableInteractionSource
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.ExperimentalLayoutApi
+import androidx.compose.foundation.layout.FlowRow
+import androidx.compose.foundation.layout.IntrinsicSize
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.text.KeyboardActions
+import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Close
+import androidx.compose.material.icons.outlined.Add
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.OutlinedTextField
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.material3.surfaceColorAtElevation
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.focus.focusRequester
+import androidx.compose.ui.focus.onFocusChanged
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalFocusManager
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.font.FontStyle
+import androidx.compose.ui.text.input.ImeAction
+import androidx.compose.ui.text.input.KeyboardCapitalization
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.unit.dp
+import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import androidx.navigation.NavController
+import com.iamageo.multifablibrary.FabIcon
+import com.iamageo.multifablibrary.FabOption
+import com.iamageo.multifablibrary.MultiFabItem
+import com.iamageo.multifablibrary.MultiFloatingActionButton
+import com.zaneschepke.wireguardautotunnel.R
+import com.zaneschepke.wireguardautotunnel.WireGuardAutoTunnel
+import com.zaneschepke.wireguardautotunnel.ui.AppViewModel
+import com.zaneschepke.wireguardautotunnel.ui.Screen
+import com.zaneschepke.wireguardautotunnel.ui.common.ClickableIconButton
+import com.zaneschepke.wireguardautotunnel.ui.common.config.ConfigurationToggle
+import com.zaneschepke.wireguardautotunnel.ui.common.text.SectionTitle
+import com.zaneschepke.wireguardautotunnel.ui.screens.main.ConfigType
+import com.zaneschepke.wireguardautotunnel.util.Constants
+import com.zaneschepke.wireguardautotunnel.util.getMessage
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
+
+@SuppressLint("UnusedMaterial3ScaffoldPaddingParameter")
+@OptIn(ExperimentalLayoutApi::class)
+@Composable
+fun OptionsScreen(
+    optionsViewModel: OptionsViewModel = hiltViewModel(),
+    navController: NavController,
+    appViewModel: AppViewModel,
+    focusRequester: FocusRequester,
+    tunnelId: String
+) {
+    val scrollState = rememberScrollState()
+    val uiState by optionsViewModel.uiState.collectAsStateWithLifecycle()
+    val context = LocalContext.current
+
+    val interactionSource = remember { MutableInteractionSource() }
+    val scope = rememberCoroutineScope()
+    val focusManager = LocalFocusManager.current
+    val screenPadding = 5.dp
+    val fillMaxWidth = .85f
+
+    var currentText by remember { mutableStateOf("") }
+
+    LaunchedEffect(Unit) {
+        optionsViewModel.init(tunnelId)
+        if (WireGuardAutoTunnel.isRunningOnAndroidTv()) {
+            delay(Constants.FOCUS_REQUEST_DELAY)
+            focusRequester.requestFocus()
+        }
+    }
+
+    fun saveTrustedSSID() {
+        if (currentText.isNotEmpty()) {
+            scope.launch {
+                optionsViewModel.onSaveRunSSID(currentText).onSuccess {
+                    currentText = ""
+                }.onFailure {
+                    appViewModel.showSnackbarMessage(it.getMessage(context))
+                }
+            }
+        }
+    }
+
+    Scaffold(
+        floatingActionButton = {
+            val secondaryColor = MaterialTheme.colorScheme.secondary
+            val hoverColor = MaterialTheme.colorScheme.surfaceColorAtElevation(2.dp)
+            var fobColor by remember { mutableStateOf(secondaryColor) }
+            MultiFloatingActionButton(
+                modifier =
+                (if (
+                    WireGuardAutoTunnel.isRunningOnAndroidTv()
+                )
+                    Modifier.focusRequester(focusRequester)
+                else Modifier)
+                    .onFocusChanged {
+                        if (WireGuardAutoTunnel.isRunningOnAndroidTv()) {
+                            fobColor = if (it.isFocused) hoverColor else secondaryColor
+                        }
+                    },
+                fabIcon = FabIcon(
+                    iconRes = R.drawable.edit,
+                    iconResAfterRotate = R.drawable.close,
+                    iconRotate = 180f
+                ),
+                fabOption = FabOption(
+                    iconTint = MaterialTheme.colorScheme.background,
+                    backgroundTint = MaterialTheme.colorScheme.primary,
+                ),
+                itemsMultiFab = listOf(
+                    MultiFabItem(
+                        label = {
+                            Text(
+                                stringResource(id = R.string.amnezia),
+                                color = Color.White,
+                                textAlign = TextAlign.Center,
+                                modifier = Modifier.padding(end = 10.dp)
+                            )
+                        },
+                        icon = R.drawable.edit,
+                        value = ConfigType.AMNEZIA.name,
+                    ),
+                    MultiFabItem(
+                        label = {
+                            Text(stringResource(id = R.string.wireguard), color = Color.White, textAlign = TextAlign.Center, modifier = Modifier.padding(end = 10.dp))
+                        },
+                        icon = R.drawable.edit,
+                        value = ConfigType.WIREGUARD.name
+                    ),
+                ),
+                onFabItemClicked = {
+                    val configType = ConfigType.valueOf(it.value)
+                    navController.navigate(
+                        "${Screen.Config.route}/${tunnelId}?configType=${configType.name}",
+                    )
+                },
+                shape = RoundedCornerShape(16.dp),
+            )
+        }
+    ) {
+        Column(
+            horizontalAlignment = Alignment.CenterHorizontally,
+            verticalArrangement = Arrangement.Top,
+            modifier =
+            Modifier
+                .fillMaxSize()
+                .verticalScroll(scrollState)
+                .clickable(
+                    indication = null,
+                    interactionSource = interactionSource,
+                ) {
+                    focusManager.clearFocus()
+                },
+        ) {
+            Surface(
+                tonalElevation = 2.dp,
+                shadowElevation = 2.dp,
+                shape = RoundedCornerShape(12.dp),
+                color = MaterialTheme.colorScheme.surface,
+                modifier =
+                (if (WireGuardAutoTunnel.isRunningOnAndroidTv()) {
+                    Modifier
+                        .height(IntrinsicSize.Min)
+                        .fillMaxWidth(fillMaxWidth)
+                        .padding(top = 10.dp)
+                } else {
+                    Modifier
+                        .fillMaxWidth(fillMaxWidth)
+                        .padding(top = 20.dp)
+                })
+                    .padding(bottom = 10.dp),
+            ) {
+                Column(
+                    horizontalAlignment = Alignment.Start,
+                    verticalArrangement = Arrangement.Top,
+                    modifier = Modifier.padding(15.dp),
+                ) {
+                    SectionTitle(
+                        title = stringResource(id = R.string.general),
+                        padding = screenPadding,
+                    )
+                    ConfigurationToggle(
+                        stringResource(R.string.set_primary_tunnel),
+                        enabled = true,
+                        checked = uiState.isDefaultTunnel,
+                        modifier = Modifier
+                            .focusRequester(focusRequester),
+                        padding = screenPadding,
+                        onCheckChanged = { optionsViewModel.onTogglePrimaryTunnel() },
+                    )
+                }
+            }
+            Surface(
+                tonalElevation = 2.dp,
+                shadowElevation = 2.dp,
+                shape = RoundedCornerShape(12.dp),
+                color = MaterialTheme.colorScheme.surface,
+                modifier =
+                (if (WireGuardAutoTunnel.isRunningOnAndroidTv()) {
+                    Modifier
+                        .height(IntrinsicSize.Min)
+                        .fillMaxWidth(fillMaxWidth)
+                        .padding(top = 10.dp)
+                } else {
+                    Modifier
+                        .fillMaxWidth(fillMaxWidth)
+                        .padding(top = 20.dp)
+                })
+                    .padding(bottom = 10.dp),
+            ) {
+                Column(
+                    horizontalAlignment = Alignment.Start,
+                    verticalArrangement = Arrangement.Top,
+                    modifier = Modifier.padding(15.dp),
+                ) {
+                    SectionTitle(
+                        title = stringResource(id = R.string.auto_tunneling),
+                        padding = screenPadding,
+                    )
+                    ConfigurationToggle(
+                        stringResource(R.string.mobile_data_tunnel),
+                        enabled = true,
+                        checked = uiState.tunnel?.isMobileDataTunnel == true,
+                        padding = screenPadding,
+                        onCheckChanged = { optionsViewModel.onToggleIsMobileDataTunnel() },
+                    )
+                    Column {
+                        FlowRow(
+                            modifier = Modifier
+                                .padding(screenPadding)
+                                .fillMaxWidth(),
+                            horizontalArrangement = Arrangement.spacedBy(5.dp),
+                        ) {
+                            uiState.tunnel?.tunnelNetworks?.forEach { ssid ->
+                                ClickableIconButton(
+                                    onClick = {
+                                        if (WireGuardAutoTunnel.isRunningOnAndroidTv()) {
+                                            focusRequester.requestFocus()
+                                            optionsViewModel.onDeleteRunSSID(ssid)
+                                        }
+                                    },
+                                    onIconClick = {
+                                        if (WireGuardAutoTunnel.isRunningOnAndroidTv()) focusRequester.requestFocus()
+                                        optionsViewModel.onDeleteRunSSID(ssid)
+
+                                    },
+                                    text = ssid,
+                                    icon = Icons.Filled.Close,
+                                    enabled = true,
+                                )
+                            }
+                            if (uiState.tunnel == null || uiState.tunnel?.tunnelNetworks?.isEmpty() == true) {
+                                Text(
+                                    stringResource(R.string.no_wifi_names_configured),
+                                    fontStyle = FontStyle.Italic,
+                                    color = Color.Gray,
+                                )
+                            }
+                        }
+                        OutlinedTextField(
+                            enabled = true,
+                            value = currentText,
+                            onValueChange = { currentText = it },
+                            label = { Text(stringResource(id = R.string.use_tunnel_on_wifi_name)) },
+                            modifier =
+                            Modifier
+                                .padding(
+                                    start = screenPadding,
+                                    top = 5.dp,
+                                    bottom = 10.dp,
+                                ),
+                            maxLines = 1,
+                            keyboardOptions =
+                            KeyboardOptions(
+                                capitalization = KeyboardCapitalization.None,
+                                imeAction = ImeAction.Done,
+                            ),
+                            keyboardActions = KeyboardActions(onDone = { saveTrustedSSID() }),
+                            trailingIcon = {
+                                if (currentText != "") {
+                                    IconButton(onClick = { saveTrustedSSID() }) {
+                                        Icon(
+                                            imageVector = Icons.Outlined.Add,
+                                            contentDescription =
+                                            if (currentText == "") {
+                                                stringResource(
+                                                    id =
+                                                    R.string
+                                                        .trusted_ssid_empty_description,
+                                                )
+                                            } else {
+                                                stringResource(
+                                                    id =
+                                                    R.string
+                                                        .trusted_ssid_value_description,
+                                                )
+                                            },
+                                            tint = MaterialTheme.colorScheme.primary,
+                                        )
+                                    }
+                                }
+                            },
+                        )
+                    }
+                }
+            }
+        }
+    }
+}

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

@@ -0,0 +1,9 @@
+package com.zaneschepke.wireguardautotunnel.ui.screens.options
+
+import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
+
+data class OptionsUiState(
+    val id: String? = null,
+    val tunnel: TunnelConfig? = null,
+    val isDefaultTunnel: Boolean = false
+)

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

@@ -0,0 +1,103 @@
+package com.zaneschepke.wireguardautotunnel.ui.screens.options
+
+import androidx.compose.ui.util.fastFirstOrNull
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.zaneschepke.wireguardautotunnel.WireGuardAutoTunnel
+import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
+import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
+import com.zaneschepke.wireguardautotunnel.util.Constants
+import com.zaneschepke.wireguardautotunnel.util.WgTunnelExceptions
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.stateIn
+import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import javax.inject.Inject
+
+@HiltViewModel
+class OptionsViewModel @Inject
+constructor(
+    private val appDataRepository: AppDataRepository
+) : ViewModel() {
+
+    private val _optionState = MutableStateFlow(OptionsUiState())
+
+    val uiState = combine(
+        appDataRepository.tunnels.getTunnelConfigsFlow(),
+        _optionState,
+    ) { tunnels, optionState ->
+        if (optionState.id != null) {
+            val tunnelConfig = tunnels.fastFirstOrNull { it.id.toString() == optionState.id }
+            val isPrimaryTunnel = tunnelConfig?.isPrimaryTunnel == true
+            OptionsUiState(optionState.id, tunnelConfig, isPrimaryTunnel)
+        } else OptionsUiState()
+    }.stateIn(
+        viewModelScope,
+        SharingStarted.WhileSubscribed(Constants.SUBSCRIPTION_TIMEOUT),
+        OptionsUiState(),
+    )
+
+    fun init(tunnelId: String) {
+        _optionState.update {
+            it.copy(
+                id = tunnelId
+            )
+        }
+    }
+
+    fun onDeleteRunSSID(ssid: String) = viewModelScope.launch(Dispatchers.IO) {
+        uiState.value.tunnel?.let {
+            appDataRepository.tunnels.save(
+                tunnelConfig = it.copy(
+                    tunnelNetworks = (uiState.value.tunnel!!.tunnelNetworks - ssid).toMutableList(),
+                ),
+            )
+        }
+    }
+
+    private fun saveTunnel(tunnelConfig: TunnelConfig?) = viewModelScope.launch(Dispatchers.IO) {
+        tunnelConfig?.let {
+            appDataRepository.tunnels.save(it)
+        }
+    }
+
+    suspend fun onSaveRunSSID(ssid: String): Result<Unit> {
+        val trimmed = ssid.trim()
+        val tunnelsWithName = withContext(viewModelScope.coroutineContext) {
+            appDataRepository.tunnels.findByTunnelNetworksName(trimmed)
+        }
+        return if (uiState.value.tunnel?.tunnelNetworks?.contains(trimmed) != true &&
+            tunnelsWithName.isEmpty()) {
+            uiState.value.tunnel?.tunnelNetworks?.add(trimmed)
+            saveTunnel(uiState.value.tunnel)
+            Result.success(Unit)
+        } else {
+            Result.failure(WgTunnelExceptions.SsidConflict())
+        }
+    }
+
+    fun onToggleIsMobileDataTunnel() = viewModelScope.launch(Dispatchers.IO) {
+        uiState.value.tunnel?.let {
+            if (it.isMobileDataTunnel) {
+                appDataRepository.tunnels.updateMobileDataTunnel(null)
+            } else appDataRepository.tunnels.updateMobileDataTunnel(it)
+        }
+    }
+
+    fun onTogglePrimaryTunnel() = viewModelScope.launch(Dispatchers.IO) {
+        if (uiState.value.tunnel != null) {
+            appDataRepository.tunnels.updatePrimaryTunnel(
+                when (uiState.value.isDefaultTunnel) {
+                    true -> null
+                    false -> uiState.value.tunnel
+                },
+            )
+            WireGuardAutoTunnel.requestTunnelTileServiceStateUpdate()
+        }
+    }
+}

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

@@ -0,0 +1,53 @@
+package com.zaneschepke.wireguardautotunnel.ui.screens.pinlock
+
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
+import androidx.navigation.NavController
+import com.zaneschepke.wireguardautotunnel.R
+import com.zaneschepke.wireguardautotunnel.WireGuardAutoTunnel
+import com.zaneschepke.wireguardautotunnel.ui.AppViewModel
+import com.zaneschepke.wireguardautotunnel.ui.Screen
+import com.zaneschepke.wireguardautotunnel.util.StringValue
+import xyz.teamgravity.pin_lock_compose.PinLock
+
+@Composable
+fun PinLockScreen(navController: NavController, appViewModel: AppViewModel) {
+    val context = LocalContext.current
+    PinLock(
+        title = { pinExists ->
+            Text(
+                text = if (pinExists) stringResource(id = R.string.enter_pin) else stringResource(
+                    id = R.string.create_pin,
+                ),
+            )
+        },
+        color = MaterialTheme.colorScheme.surface,
+        onPinCorrect = {
+            // pin is correct, navigate or hide pin lock
+            if (WireGuardAutoTunnel.isRunningOnAndroidTv()) {
+                navController.navigate(Screen.Main.route)
+            } else {
+                val isPopped = navController.popBackStack()
+                if (!isPopped) {
+                    navController.navigate(Screen.Main.route)
+                }
+            }
+
+        },
+        onPinIncorrect = {
+            // pin is incorrect, show error
+            appViewModel.showSnackbarMessage(
+                StringValue.StringResource(R.string.incorrect_pin).asString(context),
+            )
+        },
+        onPinCreated = {
+            // pin created for the first time, navigate or hide pin lock
+            appViewModel.showSnackbarMessage(
+                StringValue.StringResource(R.string.pin_created).asString(context),
+            )
+        },
+    )
+}

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

@@ -20,9 +20,7 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.ExperimentalLayoutApi
 import androidx.compose.foundation.layout.FlowRow
 import androidx.compose.foundation.layout.IntrinsicSize
-import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
@@ -55,7 +53,6 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.FocusRequester
-import androidx.compose.ui.focus.focusProperties
 import androidx.compose.ui.focus.focusRequester
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalContext
@@ -69,23 +66,27 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import androidx.navigation.NavController
 import com.google.accompanist.permissions.ExperimentalPermissionsApi
 import com.google.accompanist.permissions.isGranted
 import com.google.accompanist.permissions.rememberPermissionState
-import com.wireguard.android.backend.Tunnel
 import com.wireguard.android.backend.WgQuickBackend
 import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.WireGuardAutoTunnel
+import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
+import com.zaneschepke.wireguardautotunnel.service.tunnel.TunnelState
+import com.zaneschepke.wireguardautotunnel.ui.AppViewModel
+import com.zaneschepke.wireguardautotunnel.ui.Screen
 import com.zaneschepke.wireguardautotunnel.ui.common.ClickableIconButton
 import com.zaneschepke.wireguardautotunnel.ui.common.config.ConfigurationToggle
 import com.zaneschepke.wireguardautotunnel.ui.common.prompt.AuthorizationPrompt
-import com.zaneschepke.wireguardautotunnel.ui.common.screen.LoadingScreen
 import com.zaneschepke.wireguardautotunnel.ui.common.text.SectionTitle
-import com.zaneschepke.wireguardautotunnel.util.Event
 import com.zaneschepke.wireguardautotunnel.util.FileUtils
-import com.zaneschepke.wireguardautotunnel.util.Result
+import com.zaneschepke.wireguardautotunnel.util.getMessage
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
+import timber.log.Timber
+import xyz.teamgravity.pin_lock_compose.PinManager
 import java.io.File
 
 @OptIn(
@@ -95,15 +96,16 @@ import java.io.File
 @Composable
 fun SettingsScreen(
     viewModel: SettingsViewModel = hiltViewModel(),
-    padding: PaddingValues,
+    appViewModel: AppViewModel,
-    showSnackbarMessage: (String) -> Unit,
+    navController: NavController,
-    focusRequester: FocusRequester
+    focusRequester: FocusRequester,
 ) {
     val scope = rememberCoroutineScope { Dispatchers.IO }
     val context = LocalContext.current
     val focusManager = LocalFocusManager.current
     val scrollState = rememberScrollState()
     val interactionSource = remember { MutableInteractionSource() }
+    val pinExists = remember { mutableStateOf(PinManager.pinExists()) }
 
     val uiState by viewModel.uiState.collectAsStateWithLifecycle()
 
@@ -113,21 +115,14 @@ fun SettingsScreen(
     var showLocationServicesAlertDialog by remember { mutableStateOf(false) }
     var didExportFiles by remember { mutableStateOf(false) }
     var showAuthPrompt by remember { mutableStateOf(false) }
-    val focusRequester2 = remember { FocusRequester() }
 
     val screenPadding = 5.dp
     val fillMaxWidth = .85f
 
-    if (uiState.loading) {
-        LoadingScreen()
-        return
-    }
-
     val startForResult =
-        rememberLauncherForActivityResult(ActivityResultContracts.StartActivityForResult()) {
+        rememberLauncherForActivityResult(ActivityResultContracts.StartActivityForResult()) { result: ActivityResult ->
-            result: ActivityResult ->
             if (result.resultCode == Activity.RESULT_OK) {
-                val intent = result.data
+                result.data
                 // Handle the Intent
             }
             viewModel.setBatteryOptimizeDisableShown()
@@ -135,15 +130,28 @@ fun SettingsScreen(
 
     fun exportAllConfigs() {
         try {
-            val files = uiState.tunnels.map { File(context.cacheDir, "${it.name}.conf") }
+            val wgFiles = uiState.tunnels.map { config ->
-            files.forEachIndexed { index, file ->
+                val file = File(context.cacheDir, "${config.name}-wg.conf")
-                file.outputStream().use { it.write(uiState.tunnels[index].wgQuick.toByteArray()) }
+                file.outputStream().use {
+                    it.write(config.wgQuick.toByteArray())
                 }
-            FileUtils.saveFilesToZip(context, files)
+                file
+            }
+            val amFiles = uiState.tunnels.mapNotNull { config -> if(config.amQuick != TunnelConfig.AM_QUICK_DEFAULT) {
+                val file = File(context.cacheDir, "${config.name}-am.conf")
+                file.outputStream().use {
+                    it.write(config.amQuick.toByteArray())
+                }
+                file
+            } else null }
+            FileUtils.saveFilesToZip(context, wgFiles + amFiles).onFailure {
+                appViewModel.showSnackbarMessage(it.getMessage(context))
+            }.onSuccess {
                 didExportFiles = true
-            showSnackbarMessage(Event.Message.ConfigsExported.message)
+                appViewModel.showSnackbarMessage(context.getString(R.string.exported_configs_message))
+            }
         } catch (e: Exception) {
-            showSnackbarMessage(Event.Error.Exception(e).message)
+            Timber.e(e)
         }
     }
 
@@ -163,7 +171,9 @@ fun SettingsScreen(
 
     fun handleAutoTunnelToggle() {
         if (uiState.isBatteryOptimizeDisableShown || isBatteryOptimizationsDisabled()) {
-            viewModel.toggleAutoTunnel()
+            if (appViewModel.isRequiredPermissionGranted()) {
+                viewModel.onToggleAutoTunnel(context)
+            }
         } else {
             requestBatteryOptimizationsDisabled()
         }
@@ -171,11 +181,10 @@ fun SettingsScreen(
 
     fun saveTrustedSSID() {
         if (currentText.isNotEmpty()) {
-            viewModel.onSaveTrustedSSID(currentText).let {
+            viewModel.onSaveTrustedSSID(currentText).onSuccess {
-                when (it) {
+                currentText = ""
-                    is Result.Success -> currentText = ""
+            }.onFailure {
-                    is Result.Error -> showSnackbarMessage(it.error.message)
+                appViewModel.showSnackbarMessage(it.getMessage(context))
-                }
             }
         }
     }
@@ -248,12 +257,16 @@ fun SettingsScreen(
         Column(
             horizontalAlignment = Alignment.CenterHorizontally,
             verticalArrangement = Arrangement.Top,
-            modifier = Modifier.fillMaxSize().verticalScroll(scrollState).padding(padding),
+            modifier = Modifier
+                .fillMaxSize()
+                .verticalScroll(scrollState),
         ) {
             Icon(
                 Icons.Rounded.LocationOff,
                 contentDescription = stringResource(id = R.string.map),
-                modifier = Modifier.padding(30.dp).size(128.dp),
+                modifier = Modifier
+                    .padding(30.dp)
+                    .size(128.dp),
             )
             Text(
                 stringResource(R.string.prominent_background_location_title),
@@ -270,9 +283,13 @@ fun SettingsScreen(
             Row(
                 modifier =
                 if (WireGuardAutoTunnel.isRunningOnAndroidTv()) {
-                        Modifier.fillMaxWidth().padding(10.dp)
+                    Modifier
+                        .fillMaxWidth()
+                        .padding(10.dp)
                 } else {
-                        Modifier.fillMaxWidth().padding(30.dp)
+                    Modifier
+                        .fillMaxWidth()
+                        .padding(30.dp)
                 },
                 verticalAlignment = Alignment.CenterVertically,
                 horizontalArrangement = Arrangement.SpaceEvenly,
@@ -301,11 +318,11 @@ fun SettingsScreen(
             },
             onError = { _ ->
                 showAuthPrompt = false
-                showSnackbarMessage(Event.Error.AuthenticationFailed.message)
+                appViewModel.showSnackbarMessage(context.getString(R.string.error_authentication_failed))
             },
             onFailure = {
                 showAuthPrompt = false
-                showSnackbarMessage(Event.Error.AuthorizationFailed.message)
+                appViewModel.showSnackbarMessage(context.getString(R.string.error_authorization_failed))
             },
         )
     }
@@ -314,7 +331,7 @@ fun SettingsScreen(
         Column(
             horizontalAlignment = Alignment.CenterHorizontally,
             verticalArrangement = Arrangement.Center,
-            modifier = Modifier.fillMaxSize().padding(padding),
+            modifier = Modifier.fillMaxSize(),
         ) {
             Text(
                 stringResource(R.string.one_tunnel_required),
@@ -329,7 +346,10 @@ fun SettingsScreen(
             horizontalAlignment = Alignment.CenterHorizontally,
             verticalArrangement = Arrangement.Top,
             modifier =
-                Modifier.fillMaxSize().verticalScroll(scrollState).clickable(
+            Modifier
+                .fillMaxSize()
+                .verticalScroll(scrollState)
+                .clickable(
                     indication = null,
                     interactionSource = interactionSource,
                 ) {
@@ -343,11 +363,14 @@ fun SettingsScreen(
                 color = MaterialTheme.colorScheme.surface,
                 modifier =
                 (if (WireGuardAutoTunnel.isRunningOnAndroidTv()) {
-                            Modifier.height(IntrinsicSize.Min)
+                    Modifier
+                        .height(IntrinsicSize.Min)
                         .fillMaxWidth(fillMaxWidth)
                         .padding(top = 10.dp)
                 } else {
-                            Modifier.fillMaxWidth(fillMaxWidth).padding(top = 60.dp)
+                    Modifier
+                        .fillMaxWidth(fillMaxWidth)
+                        .padding(top = 20.dp)
                 })
                     .padding(bottom = 10.dp),
             ) {
@@ -371,25 +394,30 @@ fun SettingsScreen(
                         modifier =
                         if (uiState.settings.isAutoTunnelEnabled) Modifier
                         else
-                                Modifier.focusRequester(focusRequester).focusProperties {
+                            Modifier
-                                    down = focusRequester2
+                                .focusRequester(focusRequester),
-                                },
                     )
                     AnimatedVisibility(visible = uiState.settings.isTunnelOnWifiEnabled) {
                         Column {
                             FlowRow(
-                                modifier = Modifier.padding(screenPadding).fillMaxWidth(),
+                                modifier = Modifier
+                                    .padding(screenPadding)
+                                    .fillMaxWidth(),
                                 horizontalArrangement = Arrangement.spacedBy(5.dp),
                             ) {
                                 uiState.settings.trustedNetworkSSIDs.forEach { ssid ->
                                     ClickableIconButton(
                                         onClick = {
                                             if (WireGuardAutoTunnel.isRunningOnAndroidTv()) {
+                                                focusRequester.requestFocus()
                                                 viewModel.onDeleteTrustedSSID(ssid)
-                                                focusRequester2.requestFocus()
                                             }
                                         },
-                                        onIconClick = { viewModel.onDeleteTrustedSSID(ssid) },
+                                        onIconClick = {
+                                            if (WireGuardAutoTunnel.isRunningOnAndroidTv()) focusRequester.requestFocus()
+                                            viewModel.onDeleteTrustedSSID(ssid)
+
+                                        },
                                         text = ssid,
                                         icon = Icons.Filled.Close,
                                         enabled =
@@ -413,12 +441,12 @@ fun SettingsScreen(
                                 onValueChange = { currentText = it },
                                 label = { Text(stringResource(R.string.add_trusted_ssid)) },
                                 modifier =
-                                    Modifier.padding(
+                                Modifier
+                                    .padding(
                                         start = screenPadding,
                                         top = 5.dp,
                                         bottom = 10.dp,
-                                        )
+                                    ),
-                                        .focusRequester(focusRequester2),
                                 maxLines = 1,
                                 keyboardOptions =
                                 KeyboardOptions(
@@ -472,13 +500,13 @@ fun SettingsScreen(
                         onCheckChanged = { viewModel.onToggleTunnelOnEthernet() },
                     )
                     ConfigurationToggle(
-                        stringResource(R.string.battery_saver),
+                        stringResource(R.string.restart_on_ping),
                         enabled =
                         !(uiState.settings.isAutoTunnelEnabled ||
                             uiState.settings.isAlwaysOnVpnEnabled),
-                        checked = uiState.settings.isBatterySaverEnabled,
+                        checked = uiState.settings.isPingEnabled,
                         padding = screenPadding,
-                        onCheckChanged = { viewModel.onToggleBatterySaver() },
+                        onCheckChanged = { viewModel.onToggleRestartOnPing() },
                     )
                     Row(
                         verticalAlignment = Alignment.CenterVertically,
@@ -501,15 +529,18 @@ fun SettingsScreen(
                                 ) {
                                     when (false) {
                                         isBackgroundLocationGranted ->
-                                            showSnackbarMessage(
+                                            appViewModel.showSnackbarMessage(
-                                                Event.Error.BackgroundLocationRequired.message
+                                                context.getString(R.string.background_location_required),
                                             )
+
                                         fineLocationState.status.isGranted ->
-                                            showSnackbarMessage(
+                                            appViewModel.showSnackbarMessage(
-                                                Event.Error.PreciseLocationRequired.message
+                                                context.getString(R.string.precise_location_required),
                                             )
+
                                         viewModel.isLocationEnabled(context) ->
                                             showLocationServicesAlertDialog = true
+
                                         else -> {
                                             handleAutoTunnelToggle()
                                         }
@@ -530,13 +561,14 @@ fun SettingsScreen(
                     }
                 }
             }
-            if (WgQuickBackend.hasKernelSupport()) {
             Surface(
                 tonalElevation = 2.dp,
                 shadowElevation = 2.dp,
                 shape = RoundedCornerShape(12.dp),
                 color = MaterialTheme.colorScheme.surface,
-                    modifier = Modifier.fillMaxWidth(fillMaxWidth).padding(vertical = 10.dp),
+                modifier = Modifier
+                    .fillMaxWidth(fillMaxWidth)
+                    .padding(vertical = 10.dp),
             ) {
                 Column(
                     horizontalAlignment = Alignment.Start,
@@ -544,37 +576,47 @@ fun SettingsScreen(
                     modifier = Modifier.padding(15.dp),
                 ) {
                     SectionTitle(
-                            title = stringResource(id = R.string.kernel),
+                        title = stringResource(id = R.string.backend),
                         padding = screenPadding,
                     )
+                    ConfigurationToggle(
+                        stringResource(R.string.use_amnezia),
+                        enabled =
+                        !(uiState.settings.isAutoTunnelEnabled ||
+                            uiState.settings.isAlwaysOnVpnEnabled ||
+                            (uiState.vpnState.status == TunnelState.UP) || uiState.settings.isKernelEnabled),
+                        checked = uiState.settings.isAmneziaEnabled,
+                        padding = screenPadding,
+                        onCheckChanged = {
+                            viewModel.onToggleAmnezia()
+                        },
+                    )
+                    if (WgQuickBackend.hasKernelSupport()) {
                         ConfigurationToggle(
                             stringResource(R.string.use_kernel),
                             enabled =
                             !(uiState.settings.isAutoTunnelEnabled ||
                                 uiState.settings.isAlwaysOnVpnEnabled ||
-                                    (uiState.vpnState.status == Tunnel.State.UP)),
+                                (uiState.vpnState.status == TunnelState.UP)),
                             checked = uiState.settings.isKernelEnabled,
                             padding = screenPadding,
                             onCheckChanged = {
-                                viewModel.onToggleKernelMode().let {
+                                viewModel.onToggleKernelMode().onFailure {
-                                    when (it) {
+                                    appViewModel.showSnackbarMessage(it.getMessage(context))
-                                        is Result.Error -> showSnackbarMessage(it.error.message)
-                                        is Result.Success -> {}
-                                    }
                                 }
                             },
                         )
                     }
                 }
             }
-            if (!WireGuardAutoTunnel.isRunningOnAndroidTv()) {
             Surface(
                 tonalElevation = 2.dp,
                 shadowElevation = 2.dp,
                 shape = RoundedCornerShape(12.dp),
                 color = MaterialTheme.colorScheme.surface,
                 modifier =
-                        Modifier.fillMaxWidth(fillMaxWidth)
+                Modifier
+                    .fillMaxWidth(fillMaxWidth)
                     .padding(vertical = 10.dp)
                     .padding(bottom = 140.dp),
             ) {
@@ -587,6 +629,7 @@ fun SettingsScreen(
                         title = stringResource(id = R.string.other),
                         padding = screenPadding,
                     )
+                    if (!WireGuardAutoTunnel.isRunningOnAndroidTv()) {
                         ConfigurationToggle(
                             stringResource(R.string.always_on_vpn_support),
                             enabled = !uiState.settings.isAutoTunnelEnabled,
@@ -601,9 +644,27 @@ fun SettingsScreen(
                             padding = screenPadding,
                             onCheckChanged = { viewModel.onToggleShortcutsEnabled() },
                         )
+                    }
+                    ConfigurationToggle(
+                        stringResource(R.string.enable_app_lock),
+                        enabled = true,
+                        checked = pinExists.value,
+                        padding = screenPadding,
+                        onCheckChanged = {
+                            if (pinExists.value) {
+                                PinManager.clearPin()
+                                pinExists.value = PinManager.pinExists()
+                            } else {
+                                navController.navigate(Screen.Lock.route)
+                            }
+                        },
+                    )
+                    if (!WireGuardAutoTunnel.isRunningOnAndroidTv()) {
                         Row(
                             verticalAlignment = Alignment.CenterVertically,
-                            modifier = Modifier.fillMaxSize().padding(top = 5.dp),
+                            modifier = Modifier
+                                .fillMaxSize()
+                                .padding(top = 5.dp),
                             horizontalArrangement = Arrangement.Center,
                         ) {
                             TextButton(
@@ -616,9 +677,6 @@ fun SettingsScreen(
                     }
                 }
             }
-            if (WireGuardAutoTunnel.isRunningOnAndroidTv()) {
-                Spacer(modifier = Modifier.weight(.17f))
-            }
         }
     }
 }

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

@@ -1,7 +1,7 @@
 package com.zaneschepke.wireguardautotunnel.ui.screens.settings
 
-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
 import com.zaneschepke.wireguardautotunnel.service.tunnel.VpnState
 
 data class SettingsUiState(
@@ -9,6 +9,5 @@ data class SettingsUiState(
     val tunnels: List<TunnelConfig> = emptyList(),
     val vpnState: VpnState = VpnState(),
     val isLocationDisclosureShown: Boolean = true,
-    val isBatteryOptimizeDisableShown: Boolean = false,
+    val isBatteryOptimizeDisableShown: Boolean = false
-    val loading: Boolean = true
 )

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

@@ -1,21 +1,18 @@
 package com.zaneschepke.wireguardautotunnel.ui.screens.settings
 
-import android.app.Application
 import android.content.Context
 import android.location.LocationManager
 import androidx.core.location.LocationManagerCompat
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.wireguard.android.util.RootShell
-import com.zaneschepke.wireguardautotunnel.data.datastore.DataStoreManager
+import com.zaneschepke.wireguardautotunnel.WireGuardAutoTunnel
-import com.zaneschepke.wireguardautotunnel.data.model.Settings
+import com.zaneschepke.wireguardautotunnel.data.domain.Settings
-import com.zaneschepke.wireguardautotunnel.data.repository.SettingsRepository
+import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
-import com.zaneschepke.wireguardautotunnel.data.repository.TunnelConfigRepository
 import com.zaneschepke.wireguardautotunnel.service.foreground.ServiceManager
 import com.zaneschepke.wireguardautotunnel.service.tunnel.VpnService
 import com.zaneschepke.wireguardautotunnel.util.Constants
-import com.zaneschepke.wireguardautotunnel.util.Event
+import com.zaneschepke.wireguardautotunnel.util.WgTunnelExceptions
-import com.zaneschepke.wireguardautotunnel.util.Result
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.combine
@@ -28,28 +25,25 @@ import javax.inject.Inject
 class SettingsViewModel
 @Inject
 constructor(
-    private val application: Application,
+    private val appDataRepository: AppDataRepository,
-    private val tunnelConfigRepository: TunnelConfigRepository,
+    private val serviceManager: ServiceManager,
-    private val settingsRepository: SettingsRepository,
-    private val dataStoreManager: DataStoreManager,
     private val rootShell: RootShell,
-    private val vpnService: VpnService
+    vpnService: VpnService
 ) : ViewModel() {
 
     val uiState =
         combine(
-                settingsRepository.getSettingsFlow(),
+            appDataRepository.settings.getSettingsFlow(),
-                tunnelConfigRepository.getTunnelConfigsFlow(),
+            appDataRepository.tunnels.getTunnelConfigsFlow(),
             vpnService.vpnState,
-                dataStoreManager.preferencesFlow,
+            appDataRepository.appState.generalStateFlow,
-            ) { settings, tunnels, tunnelState, preferences ->
+        ) { settings, tunnels, tunnelState, generalState ->
             SettingsUiState(
                 settings,
                 tunnels,
                 tunnelState,
-                    preferences?.get(DataStoreManager.LOCATION_DISCLOSURE_SHOWN) ?: false,
+                generalState.locationDisclosureShown,
-                    preferences?.get(DataStoreManager.BATTERY_OPTIMIZE_DISABLE_SHOWN) ?: false,
+                generalState.batteryOptimizationDisableShown,
-                    false
             )
         }
             .stateIn(
@@ -63,20 +57,20 @@ constructor(
         return if (!uiState.value.settings.trustedNetworkSSIDs.contains(trimmed)) {
             uiState.value.settings.trustedNetworkSSIDs.add(trimmed)
             saveSettings(uiState.value.settings)
-            Result.Success(Unit)
+            Result.success(Unit)
         } else {
-            Result.Error(Event.Error.SsidConflict)
+            Result.failure(WgTunnelExceptions.SsidConflict())
         }
     }
 
     fun setLocationDisclosureShown() =
         viewModelScope.launch {
-            dataStoreManager.saveToDataStore(DataStoreManager.LOCATION_DISCLOSURE_SHOWN, true)
+            appDataRepository.appState.setLocationDisclosureShown(true)
         }
 
     fun setBatteryOptimizeDisableShown() =
         viewModelScope.launch {
-            dataStoreManager.saveToDataStore(DataStoreManager.BATTERY_OPTIMIZE_DISABLE_SHOWN, true)
+            appDataRepository.appState.setBatteryOptimizationDisableShown(true)
         }
 
     fun onToggleTunnelOnMobileData() {
@@ -96,43 +90,37 @@ constructor(
         )
     }
 
-    private suspend fun getDefaultTunnelOrFirst(): String {
+    fun onToggleAutoTunnel(context: Context) =
-        return uiState.value.settings.defaultTunnel
-            ?: tunnelConfigRepository.getAll().first().toString()
-    }
-
-    fun toggleAutoTunnel() =
         viewModelScope.launch {
             val isAutoTunnelEnabled = uiState.value.settings.isAutoTunnelEnabled
             var isAutoTunnelPaused = uiState.value.settings.isAutoTunnelPaused
 
             if (isAutoTunnelEnabled) {
-                ServiceManager.stopWatcherService(application)
+                serviceManager.stopWatcherService(context)
             } else {
-                ServiceManager.startWatcherService(application)
+                serviceManager.startWatcherService(context)
                 isAutoTunnelPaused = false
             }
             saveSettings(
                 uiState.value.settings.copy(
                     isAutoTunnelEnabled = !isAutoTunnelEnabled,
                     isAutoTunnelPaused = isAutoTunnelPaused,
-                    defaultTunnel = getDefaultTunnelOrFirst(),
                 ),
             )
+            WireGuardAutoTunnel.requestAutoTunnelTileServiceUpdate()
         }
 
     fun onToggleAlwaysOnVPN() =
         viewModelScope.launch {
-            val updatedSettings =
+            saveSettings(
                 uiState.value.settings.copy(
                     isAlwaysOnVpnEnabled = !uiState.value.settings.isAlwaysOnVpnEnabled,
-                    defaultTunnel = getDefaultTunnelOrFirst(),
+                ),
             )
-            saveSettings(updatedSettings)
         }
 
     private fun saveSettings(settings: Settings) =
-        viewModelScope.launch { settingsRepository.save(settings) }
+        viewModelScope.launch { appDataRepository.settings.save(settings) }
 
     fun onToggleTunnelOnEthernet() {
         saveSettings(
@@ -155,14 +143,6 @@ constructor(
         )
     }
 
-    fun onToggleBatterySaver() {
-        saveSettings(
-            uiState.value.settings.copy(
-                isBatterySaverEnabled = !uiState.value.settings.isBatterySaverEnabled,
-            ),
-        )
-    }
-
     private fun saveKernelMode(on: Boolean) {
         saveSettings(
             uiState.value.settings.copy(
@@ -179,19 +159,49 @@ constructor(
         )
     }
 
+    fun onToggleAmnezia() = viewModelScope.launch {
+        if(uiState.value.settings.isKernelEnabled) {
+            saveKernelMode(false)
+        }
+        saveAmneziaMode(!uiState.value.settings.isAmneziaEnabled)
+    }
+
+    private fun saveAmneziaMode(on: Boolean) {
+        saveSettings(
+            uiState.value.settings.copy(
+                isAmneziaEnabled = on
+            )
+        )
+    }
+
     fun onToggleKernelMode(): Result<Unit> {
         if (!uiState.value.settings.isKernelEnabled) {
             try {
                 rootShell.start()
-                Timber.d("Root shell accepted!")
+                Timber.i("Root shell accepted!")
-                saveKernelMode(on = true)
+                saveSettings(
+                    uiState.value.settings.copy(
+                        isKernelEnabled = true,
+                        isAmneziaEnabled = false,
+                    ),
+                )
+
             } catch (e: RootShell.RootShellException) {
+                Timber.e(e)
                 saveKernelMode(on = false)
-                return Result.Error(Event.Error.RootDenied)
+                return Result.failure(WgTunnelExceptions.RootDenied())
             }
         } else {
             saveKernelMode(on = false)
         }
-        return Result.Success(Unit)
+        return Result.success(Unit)
+    }
+
+    fun onToggleRestartOnPing() = viewModelScope.launch {
+        saveSettings(
+            uiState.value.settings.copy(
+                isPingEnabled = !uiState.value.settings.isPingEnabled,
+            ),
+        )
     }
 }

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

@@ -1,14 +1,10 @@
 package com.zaneschepke.wireguardautotunnel.ui.screens.support
 
-import android.content.Intent
-import android.content.Intent.createChooser
-import android.net.Uri
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.focusable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.IntrinsicSize
-import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
@@ -20,10 +16,11 @@ import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.rounded.ArrowForward
+import androidx.compose.material.icons.automirrored.rounded.ArrowForward
 import androidx.compose.material.icons.rounded.Book
+import androidx.compose.material.icons.rounded.FormatListNumbered
 import androidx.compose.material.icons.rounded.Mail
-import androidx.compose.material3.Divider
+import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Surface
@@ -40,26 +37,26 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.res.vectorResource
 import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.buildAnnotatedString
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.text.style.TextDecoration
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import androidx.core.content.ContextCompat.startActivity
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import androidx.navigation.NavController
 import com.zaneschepke.wireguardautotunnel.BuildConfig
 import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.WireGuardAutoTunnel
-import com.zaneschepke.wireguardautotunnel.ui.common.screen.LoadingScreen
+import com.zaneschepke.wireguardautotunnel.ui.AppViewModel
-import com.zaneschepke.wireguardautotunnel.util.Constants
+import com.zaneschepke.wireguardautotunnel.ui.Screen
-import com.zaneschepke.wireguardautotunnel.util.Event
 
 @Composable
 fun SupportScreen(
     viewModel: SupportViewModel = hiltViewModel(),
-    padding: PaddingValues,
+    appViewModel: AppViewModel,
-    showSnackbarMessage: (String) -> Unit,
+    navController: NavController,
     focusRequester: FocusRequester
 ) {
     val context = LocalContext.current
@@ -67,47 +64,14 @@ fun SupportScreen(
 
     val uiState by viewModel.uiState.collectAsStateWithLifecycle()
 
-    fun openWebPage(url: String) {
-        try {
-            val webpage: Uri = Uri.parse(url)
-            val intent = Intent(Intent.ACTION_VIEW, webpage)
-            context.startActivity(intent)
-        } catch (e: Exception) {
-            showSnackbarMessage(Event.Error.Exception(e).message)
-        }
-    }
-
-    fun launchEmail() {
-        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))
-                }
-            startActivity(
-                context,
-                createChooser(intent, context.getString(R.string.email_chooser)),
-                null,
-            )
-        } catch (e: Exception) {
-            showSnackbarMessage(Event.Error.Exception(e).message)
-        }
-    }
-
-    if (uiState.loading) {
-        LoadingScreen()
-        return
-    }
-
     Column(
         horizontalAlignment = Alignment.CenterHorizontally,
         verticalArrangement = Arrangement.Top,
         modifier =
-            Modifier.fillMaxSize()
+        Modifier
+            .fillMaxSize()
             .verticalScroll(rememberScrollState())
-                .focusable()
+            .focusable(),
-                .padding(padding),
     ) {
         Surface(
             tonalElevation = 2.dp,
@@ -116,15 +80,19 @@ fun SupportScreen(
             color = MaterialTheme.colorScheme.surface,
             modifier =
             (if (WireGuardAutoTunnel.isRunningOnAndroidTv()) {
-                        Modifier.height(IntrinsicSize.Min)
+                Modifier
+                    .height(IntrinsicSize.Min)
                     .fillMaxWidth(fillMaxWidth)
                     .padding(top = 10.dp)
             } else {
-                        Modifier.fillMaxWidth(fillMaxWidth).padding(top = 20.dp)
+                Modifier
+                    .fillMaxWidth(fillMaxWidth)
+                    .padding(top = 20.dp)
             })
                 .padding(bottom = 25.dp),
         ) {
             Column(modifier = Modifier.padding(20.dp)) {
+                val forwardIcon = Icons.AutoMirrored.Rounded.ArrowForward
                 Text(
                     stringResource(R.string.thank_you),
                     textAlign = TextAlign.Start,
@@ -139,8 +107,10 @@ fun SupportScreen(
                     modifier = Modifier.padding(bottom = 20.dp),
                 )
                 TextButton(
-                    onClick = { openWebPage(context.resources.getString(R.string.docs_url)) },
+                    onClick = { appViewModel.openWebPage(context.resources.getString(R.string.docs_url), context) },
-                    modifier = Modifier.padding(vertical = 5.dp).focusRequester(focusRequester),
+                    modifier = Modifier
+                        .padding(vertical = 5.dp)
+                        .focusRequester(focusRequester),
                 ) {
                     Row(
                         horizontalArrangement = Arrangement.SpaceBetween,
@@ -148,19 +118,32 @@ fun SupportScreen(
                         modifier = Modifier.fillMaxWidth(),
                     ) {
                         Row {
-                            Icon(Icons.Rounded.Book, stringResource(id = R.string.docs))
+                            val icon = Icons.Rounded.Book
+                            Icon(icon, icon.name)
                             Text(
                                 stringResource(id = R.string.docs_description),
                                 textAlign = TextAlign.Justify,
-                                modifier = Modifier.padding(start = 10.dp),
+                                modifier = Modifier
+                                    .padding(start = 10.dp)
+                                    .weight(
+                                        weight = 1.0f,
+                                        fill = false,
+                                    ),
+                                softWrap = true
                             )
                         }
-                        Icon(Icons.Rounded.ArrowForward, stringResource(id = R.string.go))
+                        Icon(
+                            forwardIcon,
+                            forwardIcon.name,
+                        )
                     }
                 }
-                Divider(color = MaterialTheme.colorScheme.onBackground, thickness = 0.5.dp)
+                HorizontalDivider(
+                    thickness = 0.5.dp,
+                    color = MaterialTheme.colorScheme.onBackground,
+                )
                 TextButton(
-                    onClick = { openWebPage(context.resources.getString(R.string.discord_url)) },
+                    onClick = { appViewModel.openWebPage(context.resources.getString(R.string.telegram_url), context) },
                     modifier = Modifier.padding(vertical = 5.dp),
                 ) {
                     Row(
@@ -169,9 +152,10 @@ fun SupportScreen(
                         modifier = Modifier.fillMaxWidth(),
                     ) {
                         Row {
+                            val icon = ImageVector.vectorResource(R.drawable.telegram)
                             Icon(
-                                imageVector = ImageVector.vectorResource(R.drawable.discord),
+                                icon,
-                                stringResource(id = R.string.discord),
+                                icon.name,
                                 Modifier.size(25.dp),
                             )
                             Text(
@@ -180,12 +164,18 @@ fun SupportScreen(
                                 modifier = Modifier.padding(start = 10.dp),
                             )
                         }
-                        Icon(Icons.Rounded.ArrowForward, stringResource(id = R.string.go))
+                        Icon(
+                            forwardIcon,
+                            forwardIcon.name,
+                        )
                     }
                 }
-                Divider(color = MaterialTheme.colorScheme.onBackground, thickness = 0.5.dp)
+                HorizontalDivider(
+                    thickness = 0.5.dp,
+                    color = MaterialTheme.colorScheme.onBackground,
+                )
                 TextButton(
-                    onClick = { openWebPage(context.resources.getString(R.string.github_url)) },
+                    onClick = { appViewModel.openWebPage(context.resources.getString(R.string.github_url), context) },
                     modifier = Modifier.padding(vertical = 5.dp),
                 ) {
                     Row(
@@ -194,23 +184,30 @@ fun SupportScreen(
                         modifier = Modifier.fillMaxWidth(),
                     ) {
                         Row {
+                            val icon = ImageVector.vectorResource(R.drawable.github)
                             Icon(
-                                imageVector = ImageVector.vectorResource(R.drawable.github),
+                                imageVector = icon,
-                                stringResource(id = R.string.github),
+                                icon.name,
                                 Modifier.size(25.dp),
                             )
                             Text(
-                                "Open an issue",
+                                stringResource(id = R.string.open_issue),
                                 textAlign = TextAlign.Justify,
                                 modifier = Modifier.padding(start = 10.dp),
                             )
                         }
-                        Icon(Icons.Rounded.ArrowForward, stringResource(id = R.string.go))
+                        Icon(
+                            forwardIcon,
+                            forwardIcon.name,
+                        )
                     }
                 }
-                Divider(color = MaterialTheme.colorScheme.onBackground, thickness = 0.5.dp)
+                HorizontalDivider(
+                    thickness = 0.5.dp,
+                    color = MaterialTheme.colorScheme.onBackground,
+                )
                 TextButton(
-                    onClick = { launchEmail() },
+                    onClick = { appViewModel.launchEmail(context) },
                     modifier = Modifier.padding(vertical = 5.dp),
                 ) {
                     Row(
@@ -219,14 +216,48 @@ fun SupportScreen(
                         modifier = Modifier.fillMaxWidth(),
                     ) {
                         Row {
-                            Icon(Icons.Rounded.Mail, stringResource(id = R.string.email))
+                            val icon = Icons.Rounded.Mail
+                            Icon(icon, icon.name)
                             Text(
                                 stringResource(id = R.string.email_description),
                                 textAlign = TextAlign.Justify,
                                 modifier = Modifier.padding(start = 10.dp),
                             )
                         }
-                        Icon(Icons.Rounded.ArrowForward, stringResource(id = R.string.go))
+                        Icon(
+                            forwardIcon,
+                            forwardIcon.name,
+                        )
+                    }
+                }
+                if (!WireGuardAutoTunnel.isRunningOnAndroidTv()) {
+                    HorizontalDivider(
+                        thickness = 0.5.dp,
+                        color = MaterialTheme.colorScheme.onBackground,
+                    )
+                    TextButton(
+                        onClick = { navController.navigate(Screen.Support.Logs.route) },
+                        modifier = Modifier.padding(vertical = 5.dp),
+                    ) {
+                        Row(
+                            horizontalArrangement = Arrangement.SpaceBetween,
+                            verticalAlignment = Alignment.CenterVertically,
+                            modifier = Modifier.fillMaxWidth(),
+                        ) {
+                            Row {
+                                val icon = Icons.Rounded.FormatListNumbered
+                                Icon(icon, icon.name)
+                                Text(
+                                    stringResource(id = R.string.read_logs),
+                                    textAlign = TextAlign.Justify,
+                                    modifier = Modifier.padding(start = 10.dp),
+                                )
+                            }
+                            Icon(
+                                Icons.AutoMirrored.Rounded.ArrowForward,
+                                stringResource(id = R.string.go),
+                            )
+                        }
                     }
                 }
             }
@@ -238,7 +269,7 @@ fun SupportScreen(
             fontSize = 16.sp,
             modifier =
             Modifier.clickable {
-                    openWebPage(context.resources.getString(R.string.privacy_policy_url))
+                appViewModel.openWebPage(context.resources.getString(R.string.privacy_policy_url), context)
             },
         )
         Row(
@@ -246,8 +277,21 @@ fun SupportScreen(
             verticalAlignment = Alignment.CenterVertically,
             modifier = Modifier.padding(25.dp),
         ) {
-            Text("Version: ${BuildConfig.VERSION_NAME}", modifier = Modifier.focusable())
+            val version = buildAnnotatedString {
-            Text("Mode: ${if (uiState.settings.isKernelEnabled) "Kernel" else "Userspace"}")
+                append(stringResource(id = R.string.version))
+                append(": ")
+                append(BuildConfig.VERSION_NAME)
+            }
+            val mode = buildAnnotatedString {
+                append(stringResource(R.string.mode))
+                append(": ")
+                when(uiState.settings.isKernelEnabled){
+                    true -> append(stringResource(id = R.string.kernel))
+                    false -> append(stringResource(id = R.string.userspace))
+                }
+            }
+            Text(version.text, modifier = Modifier.focusable())
+            Text(mode.text)
         }
     }
 }

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

@@ -1,5 +1,5 @@
 package com.zaneschepke.wireguardautotunnel.ui.screens.support
 
-import com.zaneschepke.wireguardautotunnel.data.model.Settings
+import com.zaneschepke.wireguardautotunnel.data.domain.Settings
 
-data class SupportUiState(val settings: Settings = Settings(), val loading: Boolean = true)
+data class SupportUiState(val settings: Settings = Settings())

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

@@ -11,13 +11,13 @@ import kotlinx.coroutines.flow.stateIn
 import javax.inject.Inject
 
 @HiltViewModel
-class SupportViewModel @Inject constructor(private val settingsRepository: SettingsRepository) :
+class SupportViewModel @Inject constructor(settingsRepository: SettingsRepository) :
     ViewModel() {
 
     val uiState =
         settingsRepository
             .getSettingsFlow()
-            .map { SupportUiState(it, false) }
+            .map { SupportUiState(it) }
             .stateIn(
                 viewModelScope,
                 SharingStarted.WhileSubscribed(Constants.SUBSCRIPTION_TIMEOUT),