fix: nightly grep

fix: nightly check
fix: play deploy job
2026-07-03 14:07:49 +02:00 · 2024-07-27 07:59:55 -04:00 · 2024-07-27 07:54:52 -04:00 · 2024-07-27 07:42:02 -04:00 · 2024-07-27 07:37:47 -04:00 · 2024-07-27 07:21:27 -04:00
174 changed files with 4075 additions and 1916 deletions
@@ -4,7 +4,7 @@

 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. 
+of delivering free, open source, and value adding software for all.

 ## Standard

@@ -2,7 +2,7 @@ name: Issue Updates Workflow

 on:
  issues:
-    types: [opened, closed, reopened]
+    types: [ opened, closed, reopened ]


 jobs:
@@ -15,6 +15,6 @@ jobs:
        run: |
          msg_text='${{ github.actor }} updated an issue:
            status: ${{ github.event.issue.state }} - #${{ github.event.issue.number }} ${{ github.event.issue.title }}
-            ${{ github.event.issue.url }}'
+            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 }}"
@@ -1,124 +0,0 @@
-name: Android CI Tag Deployment (Pre-release)
-
-on:
-  workflow_dispatch:
-  push:
-    tags:
-      - '*.*.*-**'
-
-jobs:
-  build:
-    name: Build Signed APK
-
-    runs-on: ubuntu-latest
-
-    env:
-      SIGNING_KEY_ALIAS: ${{ secrets.SIGNING_KEY_ALIAS }}
-      SIGNING_KEY_PASSWORD: ${{ secrets.SIGNING_KEY_PASSWORD }}
-      SIGNING_STORE_PASSWORD: ${{ secrets.SIGNING_STORE_PASSWORD }}
-      KEY_STORE_FILE: 'android_keystore.jks'
-      KEY_STORE_LOCATION: ${{ github.workspace }}/app/keystore/
-      GH_USER: ${{ secrets.GH_USER }}
-      GH_TOKEN: ${{ secrets.GH_TOKEN }}
-
-    steps:
-      - uses: actions/checkout@v4
-      - name: Set up JDK 17
-        uses: actions/setup-java@v4
-        with:
-          distribution: 'temurin'
-          java-version: '17'
-          cache: gradle
-      - name: Grant execute permission for gradlew
-        run: chmod +x gradlew
-
-      # Here we need to decode keystore.jks from base64 string and place it
-      # in the folder specified in the release signing configuration
-      - name: Decode Keystore
-        id: decode_keystore
-        uses: timheuer/base64-to-file@v1.2
-        with:
-          fileName: ${{ env.KEY_STORE_FILE }}
-          fileDir: ${{ env.KEY_STORE_LOCATION }}
-          encodedString: ${{ secrets.KEYSTORE }}
-
-      # create keystore path for gradle to read
-      - name: Create keystore path env var
-        run: |
-          store_path=${{ env.KEY_STORE_LOCATION }}${{ env.KEY_STORE_FILE }}
-          echo "KEY_STORE_PATH=$store_path" >> $GITHUB_ENV
-
-      - name: Create service_account.json
-        id: createServiceAccount
-        run: echo '${{ secrets.SERVICE_ACCOUNT_JSON }}' > service_account.json
-
-      # Build and sign APK ("-x test" argument is used to skip tests)
-      # add fdroid flavor for apk upload
-      - name: Build Fdroid Release APK
-        run: ./gradlew :app:assembleFdroidRelease -x test
-
-      # get fdroid flavor release apk path
-      - name: Get apk path
-        id: apk-path
-        run: echo "path=$(find . -regex '^.*/build/outputs/apk/fdroid/release/.*\.apk$' -type f | head -1)" >> $GITHUB_OUTPUT
-      - name: Get version code
-        run: |
-          version_code=$(grep "VERSION_CODE" buildSrc/src/main/kotlin/Constants.kt | awk '{print $5}' | tr -d '\n')
-          echo "VERSION_CODE=$version_code" >> $GITHUB_ENV
-      # Save the APK after the Build job is complete to publish it as a Github release in the next job
-      - name: Upload APK
-        uses: actions/upload-artifact@v4.3.1
-        with:
-          name: wgtunnel
-          path: ${{ steps.apk-path.outputs.path }}
-      - name: Download APK from build
-        uses: actions/download-artifact@v4
-        with:
-          name: wgtunnel
-      - name: Create Release with Fastlane changelog notes
-        id: create_release
-        uses: softprops/action-gh-release@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: 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:
-          ruby-version: '3.2' # Not needed with a .ruby-version file
-          bundler-cache: true
-      - name: Distribute app to Beta track 🚀
-        run: (cd ${{ github.workspace }} && bundle install && bundle exec fastlane beta)
-
@@ -2,7 +2,7 @@ name: Release Updates Workflow

 on:
  release:
-    types: [published]
+    types: [ published ]


 jobs:
@@ -16,6 +16,6 @@ jobs:
          msg_text='${{ github.actor }} published a new release:
            Release: ${{ github.event.release.tag_name }}
            ${{ github.event.release.body }}
-            ${{ github.event.release.url }}'
+            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 }}"
@@ -1,17 +1,40 @@
-# name of the workflow
-name: Android CI Tag Deployment (Release)
+name: release-android

 on:
+  schedule:
+    - cron: "4 3 * * *"
  workflow_dispatch:
-  push:
-    tags:
-      - '*.*.*'
-      - '!*.*.*-**'
+    inputs:
+      track:
+        type: choice
+        description: "Google play release track"
+        options:
+          - none
+          - internal
+          - alpha
+          - beta
+          - production
+        default: alpha
+        required: true
+      release_type:
+        type: choice
+        description: "GitHub release type"
+        options:
+          - none
+          - prerelease
+          - nightly
+          - release
+        default: release
+        required: true
+      tag_name:
+        description: "Tag name for release"
+        required: false
+        default: nightly

 jobs:
  build:
    name: Build Signed APK
-
+    if: ${{ inputs.release_type != 'none' }}
    runs-on: ubuntu-latest

    env:
@@ -34,6 +57,10 @@ jobs:
      - name: Grant execute permission for gradlew
        run: chmod +x gradlew

+      - name: Install system dependencies
+        run: |
+          sudo apt update && sudo apt install -y gh apksigner
+
      # Here we need to decode keystore.jks from base64 string and place it
      # in the folder specified in the release signing configuration
      - name: Decode Keystore
@@ -57,75 +84,126 @@ jobs:
      # Build and sign APK ("-x test" argument is used to skip tests)
      # add fdroid flavor for apk upload
      - name: Build Fdroid Release APK
+        if: ${{ inputs.release_type != '' && inputs.release_type != 'nightly' }}
        run: ./gradlew :app:assembleFdroidRelease -x test

-      # get fdroid flavor release apk path
-      - name: Get apk path
-        id: apk-path
-        run: echo "path=$(find . -regex '^.*/build/outputs/apk/fdroid/release/.*\.apk$' -type f | head -1)" >> $GITHUB_OUTPUT
+
+      - name: Build Fdroid Nightly APK
+        if: ${{ inputs.release_type == '' || inputs.release_type == 'nightly' }}
+        run: ./gradlew :app:assembleFdroidNightly -x test
+
+      - if: ${{ inputs.release_type == '' || inputs.release_type == 'nightly' }}
+        run: echo "APK_PATH=$(find . -regex '^.*/build/outputs/apk/fdroid/nightly/.*\.apk$' -type f | head -1)" >> $GITHUB_ENV
+      - if: ${{ inputs.release_type != '' && inputs.release_type != 'nightly' }}
+        run: echo "APK_PATH=$(find . -regex '^.*/build/outputs/apk/fdroid/release/.*\.apk$' -type f | head -1)" >> $GITHUB_ENV
+
      - name: Get version code
+        if: ${{ inputs.release_type == 'release' || inputs.release_type == 'prerelease' }}
        run: |
          version_code=$(grep "VERSION_CODE" buildSrc/src/main/kotlin/Constants.kt | awk '{print $5}' | tr -d '\n')
          echo "VERSION_CODE=$version_code" >> $GITHUB_ENV
+
      # Save the APK after the Build job is complete to publish it as a Github release in the next job
      - name: Upload APK
-        uses: actions/upload-artifact@v4.3.1
+        uses: actions/upload-artifact@v4.3.4
        with:
          name: wgtunnel
-          path: ${{ steps.apk-path.outputs.path }}
+          path: ${{ env.APK_PATH }}
+
      - name: Download APK from build
        uses: actions/download-artifact@v4
        with:
          name: wgtunnel
+
      - name: Repository Dispatch for my F-Droid repo
        uses: peter-evans/repository-dispatch@v3
+        if: ${{ inputs.release_type == 'release' }}
        with:
          token: ${{ secrets.PAT }}
          repository: zaneschepke/fdroid
          event-type: fdroid-update
+
+      - name: Set version release notes
+        if: ${{ inputs.release_type == 'release' || inputs.release_type == 'prerelease' }}
+        run: |
+          RELEASE_NOTES="$(cat ${{ github.workspace }}/fastlane/metadata/android/en-US/changelogs/${{ env.VERSION_CODE }}.txt)"
+          echo "RELEASE_NOTES<<EOF" >> $GITHUB_ENV
+          echo "$RELEASE_NOTES" >> $GITHUB_ENV
+          echo "EOF" >> $GITHUB_ENV
+
+      - name: On nightly release
+        if: ${{ contains(env.TAG_NAME, 'nightly') }}
+        run: |
+          echo "RELEASE_NOTES=Nightly build for the latest development version of the app." >> $GITHUB_ENV
+          gh release delete nightly --yes || true
+
+      # Setup TAG_NAME, which is used as a general "name"
+      - if: github.event_name == 'workflow_dispatch'
+        run: echo "TAG_NAME=${{ github.event.inputs.tag_name }}" >> $GITHUB_ENV
+      - if: github.event_name == 'schedule'
+        run: echo "TAG_NAME=nightly-android" >> $GITHUB_ENV
+
+      - name: On nightly release
+        if: ${{ contains(env.TAG_NAME, 'nightly') }}
+        run: |
+          echo "RELEASE_NOTES=Nightly build of the latest development version of the android client." >> $GITHUB_ENV
+          gh release delete nightly-android --yes || true
+
+      - name: Get checksum
+        id: checksum
+        run: echo "checksum=$(apksigner verify -print-certs ${{ env.APK_PATH }} | grep -Po "(?<=SHA-256 digest:) .*" | tr -d "[:blank:]")" >> $GITHUB_OUTPUT
+
+
      - name: Create Release with Fastlane changelog notes
        id: create_release
        uses: softprops/action-gh-release@v2
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          body_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: |
+            ${{ env.RELEASE_NOTES }}
            
            SHA256 fingerprint:
            ```${{ steps.checksum.outputs.checksum }}```
-          tag_name: ${{ github.ref_name }}
-          name: ${{ github.ref_name }}
+          tag_name: ${{ env.TAG_NAME }}
+          name: ${{ env.TAG_NAME }}
          draft: false
-          prerelease: false
-          append_body: true
+          prerelease: ${{ inputs.release_type == 'prerelease' || inputs.release_type == '' || inputs.release_type == 'nightly' }}
+          make_latest: ${{ inputs.release_type == 'release' }}
+          files: ${{ github.workspace }}/${{ env.APK_PATH }}
+
+  publish-play:
+    if: ${{ inputs.track != 'none' && inputs.track != '' }}
+    name: Publish to Google Play
+    runs-on: ubuntu-latest
+
+    env:
+      SIGNING_KEY_ALIAS: ${{ secrets.SIGNING_KEY_ALIAS }}
+      SIGNING_KEY_PASSWORD: ${{ secrets.SIGNING_KEY_PASSWORD }}
+      SIGNING_STORE_PASSWORD: ${{ secrets.SIGNING_STORE_PASSWORD }}
+      KEY_STORE_FILE: 'android_keystore.jks'
+      KEY_STORE_LOCATION: ${{ github.workspace }}/app/keystore/
+      GH_USER: ${{ secrets.GH_USER }}
+      GH_TOKEN: ${{ secrets.GH_TOKEN }}
+
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: '17'
+          cache: gradle
+
+      - name: Grant execute permission for gradlew
+        run: chmod +x gradlew

      - name: Deploy with fastlane
        uses: ruby/setup-ruby@v1
        with:
          ruby-version: '3.2' # Not needed with a .ruby-version file
          bundler-cache: true
-      - name: Distribute app to Prod track 🚀
-        run: (cd ${{ github.workspace }} && bundle install && bundle exec fastlane production)
+
+      - name: Distribute app to Prod track 🚀
+        run: (cd ${{ github.workspace }} && bundle install && bundle exec fastlane ${{ inputs.track }})

@@ -22,7 +22,8 @@ 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.
@@ -53,8 +54,9 @@ and on while on different networks. This app was created to offer a free solutio
 * 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 tunnel toggling, auto-tunneling
 * Static shortcuts support for tunnel toggling, auto-tunneling
 * Intent automation support for all tunnels
@@ -63,27 +65,28 @@ and on while on different networks. This app was created to offer a free solutio
 * Battery preservation measures
 * Restart tunnel on ping failure (beta)

+## Fdroid
+
+Want updates faster?
+
+Check out my personal [fdroid repository](https://github.com/zaneschepke/fdroid) to get updates the
+moment they are released.
+
 ## Docs

-Basic documentation of the feature and behaviors of this app can be
-found [here](https://zaneschepke.com/wgtunnel-docs/overview.html).
+Information about features, behaviors, and answers to common questions can be found in the
+app [documentation](https://zaneschepke.com/wgtunnel-docs/overview.html).

 The repository for these docs can be found [here](https://github.com/zaneschepke/wgtunnel-docs).

-## 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. 
+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/).\
+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

 ```
@@ -97,4 +100,11 @@ And then build the app:
 $ ./gradlew assembleDebug
 ```

-</span>
+## 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.
@@ -1,16 +1,17 @@
-import java.util.Properties
-
 plugins {
    alias(libs.plugins.android.application)
    alias(libs.plugins.kotlin.android)
    alias(libs.plugins.hilt.android)
    alias(libs.plugins.kotlinxSerialization)
    alias(libs.plugins.ksp)
+    alias(libs.plugins.compose.compiler)
+    alias(libs.plugins.grgit)
 }

 android {
    namespace = Constants.APP_ID
    compileSdk = Constants.TARGET_SDK
+    compileSdkPreview = "VanillaIceCream"

    androidResources {
        generateLocaleConfig = true
@@ -20,8 +21,8 @@ android {
        applicationId = Constants.APP_ID
        minSdk = Constants.MIN_SDK
        targetSdk = Constants.TARGET_SDK
-        versionCode = Constants.VERSION_CODE
-        versionName = Constants.VERSION_NAME
+        versionCode = versionCode()
+        versionName = versionName()

        ksp { arg("room.schemaLocation", "$projectDir/schemas") }

@@ -35,44 +36,10 @@ android {

    signingConfigs {
        create(Constants.RELEASE) {
-            val properties =
-                Properties().apply {
-                    // created local file for signing details
-                    try {
-                        load(file("signing.properties").reader())
-                    } catch (_: Exception) {
-                        load(file("signing_template.properties").reader())
-                    }
-                }
-
-            // try to get secrets from env first for pipeline build, then properties file for local
-            // build
-            storeFile =
-                file(
-                    System.getenv()
-                        .getOrDefault(
-                            Constants.KEY_STORE_PATH_VAR,
-                            properties.getProperty(Constants.KEY_STORE_PATH_VAR),
-                        ),
-                )
-            storePassword =
-                System.getenv()
-                    .getOrDefault(
-                        Constants.STORE_PASS_VAR,
-                        properties.getProperty(Constants.STORE_PASS_VAR),
-                    )
-            keyAlias =
-                System.getenv()
-                    .getOrDefault(
-                        Constants.KEY_ALIAS_VAR,
-                        properties.getProperty(Constants.KEY_ALIAS_VAR),
-                    )
-            keyPassword =
-                System.getenv()
-                    .getOrDefault(
-                        Constants.KEY_PASS_VAR,
-                        properties.getProperty(Constants.KEY_PASS_VAR),
-                    )
+            storeFile = getStoreFile()
+            storePassword = getSigningProperty(Constants.STORE_PASS_VAR)
+            keyAlias = getSigningProperty(Constants.KEY_ALIAS_VAR)
+            keyPassword = getSigningProperty(Constants.KEY_PASS_VAR)
        }
    }

@@ -100,9 +67,13 @@ android {
                getDefaultProguardFile("proguard-android-optimize.txt"),
                "proguard-rules.pro",
            )
-            signingConfig = signingConfigs.getByName(Constants.RELEASE)
+            signingConfig = signingConfigs.getByName(signingConfigName())
        }
        debug { isDebuggable = true }
+
+        create("nightly") {
+            initWith(getByName("release"))
+        }
    }
    flavorDimensions.add(Constants.TYPE)
    productFlavors {
@@ -112,9 +83,6 @@ android {
        }
        create("general") {
            dimension = Constants.TYPE
-            if (BuildHelper.isReleaseBuild(gradle) && BuildHelper.isGeneralFlavor(gradle)) {
-                //any plugins general specific
-            }
        }
    }
    compileOptions {
@@ -127,7 +95,6 @@ android {
        compose = true
        buildConfig = true
    }
-    composeOptions { kotlinCompilerExtensionVersion = Constants.COMPOSE_COMPILER_EXTENSION_VERSION }
    packaging { resources { excludes += "/META-INF/{AL2.0,LGPL2.1}" } }
 }

@@ -139,6 +106,7 @@ dependencies {

    implementation(libs.androidx.core.ktx)
    implementation(libs.androidx.lifecycle.runtime.ktx)
+
    // helpers for implementing LifecycleOwner in a Service
    implementation(libs.androidx.lifecycle.service)
    implementation(libs.androidx.activity.compose)
@@ -173,6 +141,8 @@ dependencies {
    implementation(libs.androidx.navigation.compose)
    implementation(libs.androidx.hilt.navigation.compose)

+    implementation(libs.zaneschepke.multifab)
+
    // hilt
    implementation(libs.hilt.android)
    ksp(libs.hilt.android.compiler)
@@ -200,7 +170,6 @@ dependencies {

    // barcode scanning
    implementation(libs.zxing.android.embedded)
-    implementation(libs.zxing.core)

    // bio
    implementation(libs.androidx.biometric.ktx)
@@ -209,4 +178,15 @@ dependencies {
    // shortcuts
    implementation(libs.androidx.core)
    implementation(libs.androidx.core.google.shortcuts)
+
+    // splash
+    implementation(libs.androidx.core.splashscreen)
+}
+
+fun versionCode() : Int {
+    return if(!isNightlyBuild()) Constants.VERSION_CODE else Constants.VERSION_CODE + Constants.NIGHTLY_CODE
+}
+
+fun versionName() : String {
+    return if(!isNightlyBuild()) Constants.VERSION_NAME else Constants.VERSION_NAME + "-${grgitService.service.get().grgit.head().abbreviatedId}"
 }
@@ -2,4 +2,4 @@

 -keepclassmembers class * extends androidx.datastore.preferences.protobuf.GeneratedMessageLite {
    <fields>;
-}
+}
@@ -21,6 +21,4 @@
 #-renamesourcefileattribute SourceFile
 -keepclassmembers class * extends androidx.datastore.preferences.protobuf.GeneratedMessageLite {
    <fields>;
-}
-
-
+}
@@ -51,7 +51,7 @@
    </queries>
    <application
        android:name=".WireGuardAutoTunnel"
-        android:allowBackup="true"
+        android:allowBackup="false"
        android:banner="@drawable/ic_banner"
        android:dataExtractionRules="@xml/data_extraction_rules"
        android:enableOnBackInvokedCallback="true"
@@ -60,31 +60,35 @@
        android:label="@string/app_name"
        android:roundIcon="@mipmap/ic_launcher_round"
        android:supportsRtl="true"
-        android:theme="@style/Theme.WireguardAutoTunnel"
+        android:theme="@style/Theme.AppSplashScreen"
        tools:targetApi="tiramisu">
        <activity
-            android:name=".ui.MainActivity"
+            android:name=".ui.SplashActivity"
            android:exported="true"
-            android:theme="@style/Theme.WireguardAutoTunnel">
+            android:theme="@style/Theme.AppSplashScreen">
            <intent-filter>
                <action android:name="android.intent.action.MAIN" />

                <category android:name="android.intent.category.LAUNCHER" />
                <category android:name="android.intent.category.LEANBACK_LAUNCHER" />

-                <action android:name="android.service.quicksettings.action.QS_TILE_PREFERENCES" />
            </intent-filter>
            <meta-data
                android:name="android.app.shortcuts"
                android:resource="@xml/shortcuts" />
        </activity>
        <activity
-            android:name=".ui.CaptureActivityPortrait"
-            android:screenOrientation="fullSensor"
-            android:stateNotNeeded="true"
-            android:theme="@style/zxing_CaptureTheme"
-            android:windowSoftInputMode="stateAlwaysHidden"
-            tools:ignore="DiscouragedApi" />
+            android:name=".ui.MainActivity"
+            android:exported="true"
+            android:theme="@style/Theme.WireguardAutoTunnel">
+            <intent-filter>
+                <action android:name="android.service.quicksettings.action.QS_TILE_PREFERENCES" />
+            </intent-filter>
+        </activity>
+        <activity
+            android:name="com.journeyapps.barcodescanner.CaptureActivity"
+            android:screenOrientation="portrait"
+            tools:replace="screenOrientation" />
        <activity
            android:name=".service.shortcut.ShortcutsActivity"
            android:enabled="true"
@@ -2,37 +2,37 @@ package com.zaneschepke.wireguardautotunnel

 import android.app.Application
 import android.content.ComponentName
-import android.content.Context
 import android.content.pm.PackageManager
+import android.os.StrictMode
+import android.os.StrictMode.ThreadPolicy
 import android.service.quicksettings.TileService
 import com.zaneschepke.wireguardautotunnel.service.tile.AutoTunnelControlTile
 import com.zaneschepke.wireguardautotunnel.service.tile.TunnelControlTile
 import com.zaneschepke.wireguardautotunnel.util.ReleaseTree
 import dagger.hilt.android.HiltAndroidApp
-import 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()) else Timber.plant(ReleaseTree())
-        PinManager.initialize(this)
-    }
-
-    override fun onLowMemory() {
-        super.onLowMemory()
-        applicationScope.cancel("onLowMemory() called by system")
-        applicationScope = MainScope()
+        if (BuildConfig.DEBUG) {
+            Timber.plant(Timber.DebugTree())
+            StrictMode.setThreadPolicy(
+                ThreadPolicy.Builder()
+                    .detectDiskReads()
+                    .detectDiskWrites()
+                    .detectNetwork()
+                    .penaltyLog()
+                    .build(),
+            )
+        } else Timber.plant(ReleaseTree())
    }

    companion object {

-        var applicationScope = MainScope()
-
        lateinit var instance: WireGuardAutoTunnel
            private set

@@ -40,16 +40,16 @@ class WireGuardAutoTunnel : Application() {
            return instance.packageManager.hasSystemFeature(PackageManager.FEATURE_LEANBACK)
        }

-        fun requestTunnelTileServiceStateUpdate(context: Context) {
+        fun requestTunnelTileServiceStateUpdate() {
            TileService.requestListeningState(
-                context,
+                instance,
                ComponentName(instance, TunnelControlTile::class.java),
            )
        }

-        fun requestAutoTunnelTileServiceUpdate(context: Context) {
+        fun requestAutoTunnelTileServiceUpdate() {
            TileService.requestListeningState(
-                context,
+                instance,
                ComponentName(instance, AutoTunnelControlTile::class.java),
            )
        }
@@ -33,7 +33,7 @@ import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
            to = 7,
            spec = RemoveLegacySettingColumnsMigration::class,
        ),
-        AutoMigration(7, 8)
+        AutoMigration(7, 8),
    ],
    exportSchema = true,
 )
@@ -20,6 +20,9 @@ interface TunnelConfigDao {
    @Query("SELECT * FROM TunnelConfig WHERE id=:id")
    suspend fun getById(id: Long): TunnelConfig?

+    @Query("SELECT * FROM TunnelConfig WHERE name=:name")
+    suspend fun getByName(name: String): TunnelConfig?
+
    @Query("SELECT * FROM TunnelConfig")
    suspend fun getAll(): TunnelConfigs

@@ -33,10 +36,10 @@ interface TunnelConfigDao {
    suspend fun findByTunnelNetworkName(name: String): TunnelConfigs

    @Query("UPDATE TunnelConfig SET is_primary_tunnel = 0 WHERE is_primary_tunnel =1")
-    fun resetPrimaryTunnel()
+    suspend fun resetPrimaryTunnel()

    @Query("UPDATE TunnelConfig SET is_mobile_data_tunnel = 0 WHERE is_mobile_data_tunnel =1")
-    fun resetMobileDataTunnel()
+    suspend fun resetMobileDataTunnel()

    @Query("SELECT * FROM TUNNELCONFIG WHERE is_primary_tunnel=1")
    suspend fun findByPrimary(): TunnelConfigs
@@ -7,14 +7,20 @@ import androidx.datastore.preferences.core.edit
 import androidx.datastore.preferences.core.intPreferencesKey
 import androidx.datastore.preferences.core.stringPreferencesKey
 import androidx.datastore.preferences.preferencesDataStore
+import com.zaneschepke.wireguardautotunnel.module.IoDispatcher
+import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.withContext
 import timber.log.Timber
 import java.io.IOException

-class DataStoreManager(private val context: Context) {
+class DataStoreManager(
+    private val context: Context,
+    @IoDispatcher private val ioDispatcher: CoroutineDispatcher
+) {
    companion object {
        val LOCATION_DISCLOSURE_SHOWN = booleanPreferencesKey("LOCATION_DISCLOSURE_SHOWN")
        val BATTERY_OPTIMIZE_DISABLE_SHOWN = booleanPreferencesKey("BATTERY_OPTIMIZE_DISABLE_SHOWN")
@@ -22,6 +28,7 @@ class DataStoreManager(private val context: Context) {
            booleanPreferencesKey("TUNNEL_RUNNING_FROM_MANUAL_START")
        val ACTIVE_TUNNEL = intPreferencesKey("ACTIVE_TUNNEL")
        val CURRENT_SSID = stringPreferencesKey("CURRENT_SSID")
+        val IS_PIN_LOCK_ENABLED = booleanPreferencesKey("PIN_LOCK_ENABLED")
    }

    // preferences
@@ -32,20 +39,24 @@ class DataStoreManager(private val context: Context) {
    )

    suspend fun init() {
-        try {
-            context.dataStore.data.first()
-        } catch (e: IOException) {
-            Timber.e(e)
+        withContext(ioDispatcher) {
+            try {
+                context.dataStore.data.first()
+            } catch (e: IOException) {
+                Timber.e(e)
+            }
        }
    }

    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)
+        withContext(ioDispatcher) {
+            try {
+                context.dataStore.edit { it[key] = value }
+            } catch (e: IOException) {
+                Timber.e(e)
+            } catch (e: Exception) {
+                Timber.e(e)
+            }
        }
    }

@@ -53,11 +64,13 @@ class DataStoreManager(private val context: Context) {
    fun <T> getFromStoreFlow(key: Preferences.Key<T>) = context.dataStore.data.map { it[key] }

    suspend fun <T> getFromStore(key: Preferences.Key<T>): T? {
-        return try {
-            context.dataStore.data.map { it[key] }.first()
-        } catch (e: IOException) {
-            Timber.e(e)
-            null
+        return withContext(ioDispatcher) {
+            try {
+                context.dataStore.data.map { it[key] }.first()
+            } catch (e: IOException) {
+                Timber.e(e)
+                null
+            }
        }
    }

@@ -1,14 +1,16 @@
 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 isLocationDisclosureShown: Boolean = LOCATION_DISCLOSURE_SHOWN_DEFAULT,
+    val isBatteryOptimizationDisableShown: Boolean = BATTERY_OPTIMIZATION_DISABLE_SHOWN_DEFAULT,
+    val isTunnelRunningFromManualStart: Boolean = TUNNELING_RUNNING_FROM_MANUAL_START_DEFAULT,
+    val isPinLockEnabled: Boolean = PIN_LOCK_ENABLED_DEFAULT,
    val activeTunnelId: Int? = null
 ) {
    companion object {
        const val LOCATION_DISCLOSURE_SHOWN_DEFAULT = false
        const val BATTERY_OPTIMIZATION_DISABLE_SHOWN_DEFAULT = false
        const val TUNNELING_RUNNING_FROM_MANUAL_START_DEFAULT = false
+        const val PIN_LOCK_ENABLED_DEFAULT = false
    }
 }
@@ -31,7 +31,7 @@ data class TunnelConfig(
        name = "am_quick",
        defaultValue = "",
    )
-    val amQuick: String = "",
+    val amQuick: String = AM_QUICK_DEFAULT,
 ) {
    companion object {
        fun configFromWgQuick(wgQuick: String): Config {
@@ -40,11 +40,14 @@ data class TunnelConfig(
                Config.parse(it)
            }
        }
-        fun configFromAmQuick(amQuick: String) : org.amnezia.awg.config.Config {
+
+        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 = ""
    }
 }
@@ -7,6 +7,9 @@ interface AppStateRepository {
    suspend fun isLocationDisclosureShown(): Boolean
    suspend fun setLocationDisclosureShown(shown: Boolean)

+    suspend fun isPinLockEnabled(): Boolean
+    suspend fun setPinLockEnabled(enabled: Boolean)
+
    suspend fun isBatteryOptimizationDisableShown(): Boolean
    suspend fun setBatteryOptimizationDisableShown(shown: Boolean)

@@ -17,6 +17,15 @@ class DataStoreAppStateRepository(private val dataStoreManager: DataStoreManager
        dataStoreManager.saveToDataStore(DataStoreManager.LOCATION_DISCLOSURE_SHOWN, shown)
    }

+    override suspend fun isPinLockEnabled(): Boolean {
+        return dataStoreManager.getFromStore(DataStoreManager.IS_PIN_LOCK_ENABLED)
+            ?: GeneralState.PIN_LOCK_ENABLED_DEFAULT
+    }
+
+    override suspend fun setPinLockEnabled(enabled: Boolean) {
+        dataStoreManager.saveToDataStore(DataStoreManager.IS_PIN_LOCK_ENABLED, enabled)
+    }
+
    override suspend fun isBatteryOptimizationDisableShown(): Boolean {
        return dataStoreManager.getFromStore(DataStoreManager.BATTERY_OPTIMIZE_DISABLE_SHOWN)
            ?: GeneralState.BATTERY_OPTIMIZATION_DISABLE_SHOWN_DEFAULT
@@ -65,11 +74,13 @@ class DataStoreAppStateRepository(private val dataStoreManager: DataStoreManager
            prefs?.let { pref ->
                try {
                    GeneralState(
-                        locationDisclosureShown = pref[DataStoreManager.LOCATION_DISCLOSURE_SHOWN]
+                        isLocationDisclosureShown = pref[DataStoreManager.LOCATION_DISCLOSURE_SHOWN]
                            ?: GeneralState.LOCATION_DISCLOSURE_SHOWN_DEFAULT,
-                        batteryOptimizationDisableShown = pref[DataStoreManager.BATTERY_OPTIMIZE_DISABLE_SHOWN]
+                        isBatteryOptimizationDisableShown = pref[DataStoreManager.BATTERY_OPTIMIZE_DISABLE_SHOWN]
                            ?: GeneralState.BATTERY_OPTIMIZATION_DISABLE_SHOWN_DEFAULT,
-                        tunnelRunningFromManualStart = pref[DataStoreManager.TUNNEL_RUNNING_FROM_MANUAL_START]
+                        isTunnelRunningFromManualStart = pref[DataStoreManager.TUNNEL_RUNNING_FROM_MANUAL_START]
+                            ?: GeneralState.TUNNELING_RUNNING_FROM_MANUAL_START_DEFAULT,
+                        isPinLockEnabled = pref[DataStoreManager.IS_PIN_LOCK_ENABLED]
                            ?: GeneralState.TUNNELING_RUNNING_FROM_MANUAL_START_DEFAULT,
                    )
                } catch (e: IllegalArgumentException) {
@@ -54,6 +54,10 @@ class RoomTunnelConfigRepository(private val tunnelConfigDao: TunnelConfigDao) :
        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)
    }
@@ -22,6 +22,8 @@ interface TunnelConfigRepository {

    suspend fun count(): Int

+    suspend fun findByTunnelName(name: String): TunnelConfig?
+
    suspend fun findByTunnelNetworksName(name: String): TunnelConfigs

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

 import javax.inject.Qualifier

+@Qualifier
+@Retention(AnnotationRetention.BINARY)
+annotation class Kernel
+
@Qualifier
@Retention(AnnotationRetention.BINARY)
 annotation class Userspace
@@ -0,0 +1,27 @@
+package com.zaneschepke.wireguardautotunnel.module
+
+import javax.inject.Qualifier
+
+@Retention(AnnotationRetention.RUNTIME)
+@Qualifier
+annotation class DefaultDispatcher
+
+@Retention(AnnotationRetention.RUNTIME)
+@Qualifier
+annotation class IoDispatcher
+
+@Retention(AnnotationRetention.RUNTIME)
+@Qualifier
+annotation class MainDispatcher
+
+@Retention(AnnotationRetention.BINARY)
+@Qualifier
+annotation class MainImmediateDispatcher
+
+@Retention(AnnotationRetention.RUNTIME)
+@Qualifier
+annotation class ApplicationScope
+
+@Retention(AnnotationRetention.RUNTIME)
+@Qualifier
+annotation class ServiceScope
@@ -0,0 +1,28 @@
+package com.zaneschepke.wireguardautotunnel.module
+
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.Dispatchers
+
+@Module
+@InstallIn(SingletonComponent::class)
+object CoroutinesDispatchersModule {
+    @DefaultDispatcher
+    @Provides
+    fun providesDefaultDispatcher(): CoroutineDispatcher = Dispatchers.Default
+
+    @IoDispatcher
+    @Provides
+    fun providesIoDispatcher(): CoroutineDispatcher = Dispatchers.IO
+
+    @MainDispatcher
+    @Provides
+    fun providesMainDispatcher(): CoroutineDispatcher = Dispatchers.Main
+
+    @MainImmediateDispatcher
+    @Provides
+    fun providesMainImmediateDispatcher(): CoroutineDispatcher = Dispatchers.Main.immediate
+}
@@ -1,30 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.module
-
-import android.content.Context
-import androidx.room.Room
-import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.data.AppDatabase
-import com.zaneschepke.wireguardautotunnel.data.DatabaseCallback
-import dagger.Module
-import dagger.Provides
-import dagger.hilt.InstallIn
-import dagger.hilt.android.qualifiers.ApplicationContext
-import dagger.hilt.components.SingletonComponent
-import javax.inject.Singleton
-
-@Module
-@InstallIn(SingletonComponent::class)
-class DatabaseModule {
-    @Provides
-    @Singleton
-    fun provideDatabase(@ApplicationContext context: Context): AppDatabase {
-        return Room.databaseBuilder(
-            context,
-            AppDatabase::class.java,
-            context.getString(R.string.db_name),
-        )
-            .fallbackToDestructiveMigration()
-            .addCallback(DatabaseCallback())
-            .build()
-    }
-}
@@ -1,7 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.module
-
-import javax.inject.Qualifier
-
-@Qualifier
-@Retention(AnnotationRetention.BINARY)
-annotation class Kernel
@@ -1,7 +1,10 @@
 package com.zaneschepke.wireguardautotunnel.module

 import android.content.Context
+import androidx.room.Room
+import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.data.AppDatabase
+import com.zaneschepke.wireguardautotunnel.data.DatabaseCallback
 import com.zaneschepke.wireguardautotunnel.data.SettingsDao
 import com.zaneschepke.wireguardautotunnel.data.TunnelConfigDao
 import com.zaneschepke.wireguardautotunnel.data.datastore.DataStoreManager
@@ -18,11 +21,25 @@ import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.android.qualifiers.ApplicationContext
 import dagger.hilt.components.SingletonComponent
+import kotlinx.coroutines.CoroutineDispatcher
 import javax.inject.Singleton

@Module
@InstallIn(SingletonComponent::class)
 class RepositoryModule {
+    @Provides
+    @Singleton
+    fun provideDatabase(@ApplicationContext context: Context): AppDatabase {
+        return Room.databaseBuilder(
+            context,
+            AppDatabase::class.java,
+            context.getString(R.string.db_name),
+        )
+            .fallbackToDestructiveMigration()
+            .addCallback(DatabaseCallback())
+            .build()
+    }
+
    @Singleton
    @Provides
    fun provideSettingsDoa(appDatabase: AppDatabase): SettingsDao {
@@ -49,8 +66,11 @@ class RepositoryModule {

    @Singleton
    @Provides
-    fun providePreferencesDataStore(@ApplicationContext context: Context): DataStoreManager {
-        return DataStoreManager(context)
+    fun providePreferencesDataStore(
+        @ApplicationContext context: Context,
+        @IoDispatcher ioDispatcher: CoroutineDispatcher
+    ): DataStoreManager {
+        return DataStoreManager(context, ioDispatcher)
    }

    @Provides
@@ -15,6 +15,9 @@ import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.android.qualifiers.ApplicationContext
 import dagger.hilt.components.SingletonComponent
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.CoroutineScope
+import javax.inject.Provider
 import javax.inject.Singleton

@Module
@@ -42,24 +45,36 @@ class TunnelModule {

    @Provides
    @Singleton
-    fun provideAmneziaBackend(@ApplicationContext context: Context) : org.amnezia.awg.backend.Backend {
+    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,
-        appDataRepository: AppDataRepository
+        amneziaBackend: Provider<org.amnezia.awg.backend.Backend>,
+        @Userspace userspaceBackend: Provider<Backend>,
+        @Kernel kernelBackend: Provider<Backend>,
+        appDataRepository: AppDataRepository,
+        @ApplicationScope applicationScope: CoroutineScope,
+        @IoDispatcher ioDispatcher: CoroutineDispatcher
    ): VpnService {
-        return WireGuardTunnel(amneziaBackend,userspaceBackend, kernelBackend, appDataRepository)
+        return WireGuardTunnel(
+            amneziaBackend,
+            userspaceBackend,
+            kernelBackend,
+            appDataRepository,
+            applicationScope,
+            ioDispatcher,
+        )
    }

    @Provides
    @Singleton
-    fun provideServiceManager(appDataRepository: AppDataRepository): ServiceManager {
-        return ServiceManager(appDataRepository)
+    fun provideServiceManager(
+        appDataRepository: AppDataRepository,
+        @IoDispatcher ioDispatcher: CoroutineDispatcher
+    ): ServiceManager {
+        return ServiceManager(appDataRepository, ioDispatcher)
    }
 }
@@ -0,0 +1,25 @@
+package com.zaneschepke.wireguardautotunnel.module
+
+import android.content.Context
+import com.zaneschepke.wireguardautotunnel.util.FileUtils
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.android.components.ViewModelComponent
+import dagger.hilt.android.qualifiers.ApplicationContext
+import dagger.hilt.android.scopes.ViewModelScoped
+import kotlinx.coroutines.CoroutineDispatcher
+
+@Module
+@InstallIn(ViewModelComponent::class)
+class ViewModelModule {
+
+    @ViewModelScoped
+    @Provides
+    fun provideFileUtils(
+        @ApplicationContext context: Context,
+        @IoDispatcher ioDispatcher: CoroutineDispatcher
+    ): FileUtils {
+        return FileUtils(context, ioDispatcher)
+    }
+}
@@ -4,9 +4,11 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
+import com.zaneschepke.wireguardautotunnel.module.ApplicationScope
 import com.zaneschepke.wireguardautotunnel.service.foreground.ServiceManager
-import com.zaneschepke.wireguardautotunnel.util.goAsync
 import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.launch
 import timber.log.Timber
 import javax.inject.Inject

@@ -19,27 +21,36 @@ class BootReceiver : BroadcastReceiver() {
    @Inject
    lateinit var serviceManager: ServiceManager

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

@@ -21,16 +23,22 @@ class NotificationActionReceiver : BroadcastReceiver() {
    @Inject
    lateinit var serviceManager: ServiceManager

-    override fun onReceive(context: Context, intent: Intent?) = goAsync {
-        try {
-            //TODO fix for manual start changes when enabled
-            serviceManager.stopVpnServiceForeground(context)
-            delay(Constants.TOGGLE_TUNNEL_DELAY)
-            serviceManager.startVpnServiceForeground(context)
-        } catch (e: Exception) {
-            Timber.e(e)
-        } finally {
-            cancel()
+    @Inject
+    @ApplicationScope
+    lateinit var applicationScope: CoroutineScope
+
+    override fun onReceive(context: Context, intent: Intent?) {
+        applicationScope.launch {
+            try {
+                //TODO fix for manual start changes when enabled
+                serviceManager.stopVpnServiceForeground(context)
+                delay(Constants.TOGGLE_TUNNEL_DELAY)
+                serviceManager.startVpnServiceForeground(context)
+            } catch (e: Exception) {
+                Timber.e(e)
+            } finally {
+                cancel()
+            }
        }
    }
 }
@@ -24,6 +24,7 @@ open class ForegroundService : LifecycleService() {
            when (action) {
                Action.START.name,
                Action.START_FOREGROUND.name -> startService(intent.extras)
+
                Action.STOP.name, Action.STOP_FOREGROUND.name -> stopService()
                Constants.ALWAYS_ON_VPN_ACTION -> {
                    Timber.i("Always-on VPN starting service")
@@ -4,10 +4,16 @@ import android.app.Service
 import android.content.Context
 import android.content.Intent
 import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
+import com.zaneschepke.wireguardautotunnel.module.IoDispatcher
 import com.zaneschepke.wireguardautotunnel.util.Constants
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.withContext
 import timber.log.Timber

-class ServiceManager(private val appDataRepository: AppDataRepository) {
+class ServiceManager(
+    private val appDataRepository: AppDataRepository,
+    @IoDispatcher private val ioDispatcher: CoroutineDispatcher
+) {

    private fun <T : Service> actionOnService(
        action: Action,
@@ -23,7 +29,10 @@ class ServiceManager(private val appDataRepository: AppDataRepository) {
        intent.component?.javaClass
        try {
            when (action) {
-                Action.START_FOREGROUND, Action.STOP_FOREGROUND -> context.startForegroundService(intent)
+                Action.START_FOREGROUND, Action.STOP_FOREGROUND -> context.startForegroundService(
+                    intent,
+                )
+
                Action.START, Action.STOP -> context.startService(intent)
            }
        } catch (e: Exception) {
@@ -46,23 +55,27 @@ class ServiceManager(private val appDataRepository: AppDataRepository) {
    }

    suspend fun stopVpnServiceForeground(context: Context, isManualStop: Boolean = false) {
-        if (isManualStop) onManualStop()
-        Timber.i("Stopping vpn service")
-        actionOnService(
-            Action.STOP_FOREGROUND,
-            context,
-            WireGuardTunnelService::class.java,
-        )
+        withContext(ioDispatcher) {
+            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,
-            WireGuardTunnelService::class.java,
-        )
+        withContext(ioDispatcher) {
+            if (isManualStop) onManualStop()
+            Timber.i("Stopping vpn service")
+            actionOnService(
+                Action.STOP,
+                context,
+                WireGuardTunnelService::class.java,
+            )
+        }
    }

    private suspend fun onManualStop() {
@@ -80,13 +93,15 @@ class ServiceManager(private val appDataRepository: AppDataRepository) {
        tunnelId: Int? = null,
        isManualStart: Boolean = false
    ) {
-        if (isManualStart) onManualStart(tunnelId)
-        actionOnService(
-            Action.START_FOREGROUND,
-            context,
-            WireGuardTunnelService::class.java,
-            tunnelId?.let { mapOf(Constants.TUNNEL_EXTRA_KEY to it) },
-        )
+        withContext(ioDispatcher) {
+            if (isManualStart) onManualStart(tunnelId)
+            actionOnService(
+                Action.START_FOREGROUND,
+                context,
+                WireGuardTunnelService::class.java,
+                tunnelId?.let { mapOf(Constants.TUNNEL_EXTRA_KEY to it) },
+            )
+        }
    }

    fun startWatcherServiceForeground(
@@ -1,84 +1,56 @@
 package com.zaneschepke.wireguardautotunnel.service.foreground

 import com.zaneschepke.wireguardautotunnel.data.domain.Settings
-import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
-import com.zaneschepke.wireguardautotunnel.service.tunnel.TunnelState

 data class WatcherState(
    val isWifiConnected: Boolean = false,
-    val config: TunnelConfig? = null,
-    val vpnStatus: TunnelState = TunnelState.DOWN,
    val isEthernetConnected: Boolean = false,
    val isMobileDataConnected: Boolean = false,
    val currentNetworkSSID: String = "",
    val settings: Settings = Settings()
 ) {
-
-    private fun isVpnConnected() = vpnStatus == TunnelState.UP
    fun isEthernetConditionMet(): Boolean {
        return (isEthernetConnected &&
-            settings.isTunnelOnEthernetEnabled &&
-            !isVpnConnected())
+            settings.isTunnelOnEthernetEnabled)
    }

    fun isMobileDataConditionMet(): Boolean {
        return (!isEthernetConnected &&
            settings.isTunnelOnMobileDataEnabled &&
            !isWifiConnected &&
-            isMobileDataConnected &&
-            !isVpnConnected())
-    }
-
-    fun isTunnelNotMobileDataPreferredConditionMet(): Boolean {
-        return (!isEthernetConnected &&
-            settings.isTunnelOnMobileDataEnabled &&
-            !isWifiConnected &&
-            isMobileDataConnected &&
-            config?.isMobileDataTunnel == false && isVpnConnected())
+            isMobileDataConnected)
    }

    fun isTunnelOffOnMobileDataConditionMet(): Boolean {
        return (!isEthernetConnected &&
            !settings.isTunnelOnMobileDataEnabled &&
            isMobileDataConnected &&
-            !isWifiConnected &&
-            isVpnConnected())
+            !isWifiConnected)
    }

    fun isUntrustedWifiConditionMet(): Boolean {
        return (!isEthernetConnected &&
            isWifiConnected &&
            !settings.trustedNetworkSSIDs.contains(currentNetworkSSID) &&
-            settings.isTunnelOnWifiEnabled
-            && !isVpnConnected())
-    }
-
-    fun isTunnelNotWifiNamePreferredMet(ssid: String): Boolean {
-        return (!isEthernetConnected &&
-            isWifiConnected &&
-            !settings.trustedNetworkSSIDs.contains(currentNetworkSSID) &&
-            settings.isTunnelOnWifiEnabled && config?.tunnelNetworks?.contains(ssid) == false && isVpnConnected())
+            settings.isTunnelOnWifiEnabled)
    }

    fun isTrustedWifiConditionMet(): Boolean {
        return (!isEthernetConnected &&
            (isWifiConnected &&
-                settings.trustedNetworkSSIDs.contains(currentNetworkSSID)) &&
-            (isVpnConnected()))
+                settings.trustedNetworkSSIDs.contains(currentNetworkSSID)))
    }

    fun isTunnelOffOnWifiConditionMet(): Boolean {
        return (!isEthernetConnected &&
            (isWifiConnected &&
-                !settings.isTunnelOnWifiEnabled &&
-                (isVpnConnected())))
+                !settings.isTunnelOnWifiEnabled))
    }

    fun isTunnelOffOnNoConnectivityMet(): Boolean {
        return (!isEthernetConnected &&
            !isWifiConnected &&
-            !isMobileDataConnected &&
-            (isVpnConnected()))
+            !isMobileDataConnected)
    }
 }

@@ -8,6 +8,8 @@ import androidx.lifecycle.lifecycleScope
 import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
 import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
+import com.zaneschepke.wireguardautotunnel.module.IoDispatcher
+import com.zaneschepke.wireguardautotunnel.module.MainImmediateDispatcher
 import com.zaneschepke.wireguardautotunnel.service.network.EthernetService
 import com.zaneschepke.wireguardautotunnel.service.network.MobileDataService
 import com.zaneschepke.wireguardautotunnel.service.network.NetworkService
@@ -19,12 +21,14 @@ import com.zaneschepke.wireguardautotunnel.service.tunnel.VpnService
 import com.zaneschepke.wireguardautotunnel.util.Constants
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.CancellationException
-import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.collectLatest
+import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import timber.log.Timber
 import java.net.InetAddress
 import javax.inject.Inject
@@ -55,6 +59,14 @@ class WireGuardConnectivityWatcherService : ForegroundService() {
    @Inject
    lateinit var serviceManager: ServiceManager

+    @Inject
+    @IoDispatcher
+    lateinit var ioDispatcher: CoroutineDispatcher
+
+    @Inject
+    @MainImmediateDispatcher
+    lateinit var mainImmediateDispatcher: CoroutineDispatcher
+
    private val networkEventsFlow = MutableStateFlow(WatcherState())

    private var watcherJob: Job? = null
@@ -64,7 +76,7 @@ class WireGuardConnectivityWatcherService : ForegroundService() {

    override fun onCreate() {
        super.onCreate()
-        lifecycleScope.launch(Dispatchers.Main) {
+        lifecycleScope.launch(mainImmediateDispatcher) {
            try {
                if (appDataRepository.settings.getSettings().isAutoTunnelPaused) {
                    launchWatcherPausedNotification()
@@ -137,14 +149,14 @@ class WireGuardConnectivityWatcherService : ForegroundService() {
    private fun cancelWatcherJob() {
        try {
            watcherJob?.cancel()
-        } catch (e : CancellationException) {
+        } catch (e: CancellationException) {
            Timber.i("Watcher job cancelled")
        }
    }

    private fun startWatcherJob() {
        watcherJob =
-            lifecycleScope.launch(Dispatchers.IO) {
+            lifecycleScope.launch {
                val setting = appDataRepository.settings.getSettings()
                launch {
                    Timber.i("Starting wifi watcher")
@@ -162,10 +174,6 @@ class WireGuardConnectivityWatcherService : ForegroundService() {
                        watchForEthernetConnectivityChanges()
                    }
                }
-                launch {
-                    Timber.i("Starting vpn state watcher")
-                    watchForVpnConnectivityChanges()
-                }
                launch {
                    Timber.i("Starting settings watcher")
                    watchForSettingsChanges()
@@ -185,160 +193,170 @@ class WireGuardConnectivityWatcherService : ForegroundService() {
    }

    private suspend fun watchForMobileDataConnectivityChanges() {
-        mobileDataService.networkStatus.collect {
-            when (it) {
-                is NetworkStatus.Available -> {
-                    Timber.i("Gained Mobile data connection")
-                    networkEventsFlow.value =
-                        networkEventsFlow.value.copy(
-                            isMobileDataConnected = true,
-                        )
-                }
+        withContext(ioDispatcher) {
+            mobileDataService.networkStatus.collect { status ->
+                when (status) {
+                    is NetworkStatus.Available -> {
+                        Timber.i("Gained Mobile data connection")
+                        networkEventsFlow.update {
+                            it.copy(
+                                isMobileDataConnected = true,
+                            )
+                        }
+                    }

-                is NetworkStatus.CapabilitiesChanged -> {
-                    networkEventsFlow.value =
-                        networkEventsFlow.value.copy(
-                            isMobileDataConnected = true,
-                        )
-                    Timber.i("Mobile data capabilities changed")
-                }
+                    is NetworkStatus.CapabilitiesChanged -> {
+                        networkEventsFlow.update {
+                            it.copy(
+                                isMobileDataConnected = true,
+                            )
+                        }
+                        Timber.i("Mobile data capabilities changed")
+                    }

-                is NetworkStatus.Unavailable -> {
-                    networkEventsFlow.value =
-                        networkEventsFlow.value.copy(
-                            isMobileDataConnected = false,
-                        )
-                    Timber.i("Lost mobile data connection")
+                    is NetworkStatus.Unavailable -> {
+                        networkEventsFlow.update {
+                            it.copy(
+                                isMobileDataConnected = false,
+                            )
+                        }
+                        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.BACKUP_PING_HOST
-                            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)
-                            delay(Constants.PING_COOLDOWN)
+        val context = this
+        withContext(ioDispatcher) {
+            try {
+                do {
+                    if (vpnService.vpnState.value.status == TunnelState.UP) {
+                        val tunnelConfig = vpnService.vpnState.value.tunnelConfig
+                        tunnelConfig?.let {
+                            val config = TunnelConfig.configFromWgQuick(it.wgQuick)
+                            val results = config.peers.map { peer ->
+                                val host = if (peer.endpoint.isPresent &&
+                                    peer.endpoint.get().resolved.isPresent)
+                                    peer.endpoint.get().resolved.get().host
+                                else Constants.DEFAULT_PING_IP
+                                Timber.i("Checking reachability of: $host")
+                                val reachable = InetAddress.getByName(host)
+                                    .isReachable(Constants.PING_TIMEOUT.toInt())
+                                Timber.i("Result: reachable - $reachable")
+                                reachable
+                            }
+                            if (results.contains(false)) {
+                                Timber.i("Restarting VPN for ping failure")
+                                serviceManager.stopVpnServiceForeground(context)
+                                delay(Constants.VPN_RESTART_DELAY)
+                                serviceManager.startVpnServiceForeground(context, it.id)
+                                delay(Constants.PING_COOLDOWN)
+                            }
                        }
                    }
-                }
-                delay(Constants.PING_INTERVAL)
-            } while (true)
-        } catch (e: Exception) {
-            Timber.e(e)
+                    delay(Constants.PING_INTERVAL)
+                } while (true)
+            } catch (e: Exception) {
+                Timber.e(e)
+            }
        }
    }

    private suspend fun watchForSettingsChanges() {
-        appDataRepository.settings.getSettingsFlow().collect {
-            if (networkEventsFlow.value.settings.isAutoTunnelPaused != it.isAutoTunnelPaused) {
-                when (it.isAutoTunnelPaused) {
+        appDataRepository.settings.getSettingsFlow().collect { settings ->
+            if (networkEventsFlow.value.settings.isAutoTunnelPaused != settings.isAutoTunnelPaused) {
+                when (settings.isAutoTunnelPaused) {
                    true -> launchWatcherPausedNotification()
                    false -> launchWatcherNotification()
                }
            }
-            networkEventsFlow.value =
-                networkEventsFlow.value.copy(
-                    settings = it,
-                )
-        }
-    }
-
-    private suspend fun watchForVpnConnectivityChanges() {
-        vpnService.vpnState.collect {
-            networkEventsFlow.value =
-                networkEventsFlow.value.copy(
-                    vpnStatus = it.status,
-                    config = it.tunnelConfig,
+            networkEventsFlow.update {
+                it.copy(
+                    settings = settings,
                )
+            }
        }
    }

    private suspend fun watchForEthernetConnectivityChanges() {
-        ethernetService.networkStatus.collect {
-            when (it) {
-                is NetworkStatus.Available -> {
-                    Timber.i("Gained Ethernet connection")
-                    networkEventsFlow.value =
-                        networkEventsFlow.value.copy(
-                            isEthernetConnected = true,
-                        )
-                }
+        withContext(ioDispatcher) {
+            ethernetService.networkStatus.collect { status ->
+                when (status) {
+                    is NetworkStatus.Available -> {
+                        Timber.i("Gained Ethernet connection")
+                        networkEventsFlow.update {
+                            it.copy(
+                                isEthernetConnected = true,
+                            )
+                        }
+                    }

-                is NetworkStatus.CapabilitiesChanged -> {
-                    Timber.i("Ethernet capabilities changed")
-                    networkEventsFlow.value =
-                        networkEventsFlow.value.copy(
-                            isEthernetConnected = true,
-                        )
-                }
+                    is NetworkStatus.CapabilitiesChanged -> {
+                        Timber.i("Ethernet capabilities changed")
+                        networkEventsFlow.update {
+                            it.copy(
+                                isEthernetConnected = true,
+                            )
+                        }
+                    }

-                is NetworkStatus.Unavailable -> {
-                    networkEventsFlow.value =
-                        networkEventsFlow.value.copy(
-                            isEthernetConnected = false,
-                        )
-                    Timber.i("Lost Ethernet connection")
+                    is NetworkStatus.Unavailable -> {
+                        networkEventsFlow.update {
+                            it.copy(
+                                isEthernetConnected = false,
+                            )
+                        }
+                        Timber.i("Lost Ethernet connection")
+                    }
                }
            }
        }
    }

    private suspend fun watchForWifiConnectivityChanges() {
-        wifiService.networkStatus.collect {
-            when (it) {
-                is NetworkStatus.Available -> {
-                    Timber.i("Gained Wi-Fi connection")
-                    networkEventsFlow.value =
-                        networkEventsFlow.value.copy(
-                            isWifiConnected = true,
-                        )
-                }
-
-                is NetworkStatus.CapabilitiesChanged -> {
-                    Timber.i("Wifi capabilities changed")
-                    networkEventsFlow.value =
-                        networkEventsFlow.value.copy(
-                            isWifiConnected = true,
-                        )
-                    val ssid = wifiService.getNetworkName(it.networkCapabilities)
-                    ssid?.let { name ->
-                        if(name.contains(Constants.UNREADABLE_SSID)) {
-                            Timber.w("SSID unreadable: missing permissions")
-                        } else Timber.i("Detected valid SSID")
-                        appDataRepository.appState.setCurrentSsid(name)
-                        networkEventsFlow.value =
-                            networkEventsFlow.value.copy(
-                                currentNetworkSSID = name,
+        withContext(ioDispatcher) {
+            wifiService.networkStatus.collect { status ->
+                when (status) {
+                    is NetworkStatus.Available -> {
+                        Timber.i("Gained Wi-Fi connection")
+                        networkEventsFlow.update {
+                            it.copy(
+                                isWifiConnected = true,
                            )
-                    } ?: Timber.w("Failed to read ssid")
-                }
+                        }
+                    }

-                is NetworkStatus.Unavailable -> {
-                    networkEventsFlow.value =
-                        networkEventsFlow.value.copy(
-                            isWifiConnected = false,
-                        )
-                    Timber.i("Lost Wi-Fi connection")
+                    is NetworkStatus.CapabilitiesChanged -> {
+                        Timber.i("Wifi capabilities changed")
+                        networkEventsFlow.update {
+                            it.copy(
+                                isWifiConnected = true,
+                            )
+                        }
+                        val ssid = wifiService.getNetworkName(status.networkCapabilities)
+                        ssid?.let { name ->
+                            if (name.contains(Constants.UNREADABLE_SSID)) {
+                                Timber.w("SSID unreadable: missing permissions")
+                            } else Timber.i("Detected valid SSID")
+                            appDataRepository.appState.setCurrentSsid(name)
+                            networkEventsFlow.update {
+                                it.copy(
+                                    currentNetworkSSID = name,
+                                )
+                            }
+                        } ?: Timber.w("Failed to read ssid")
+                    }
+
+                    is NetworkStatus.Unavailable -> {
+                        networkEventsFlow.update {
+                            it.copy(
+                                isWifiConnected = false,
+                            )
+                        }
+                        Timber.i("Lost Wi-Fi connection")
+                    }
                }
            }
        }
@@ -352,76 +370,84 @@ class WireGuardConnectivityWatcherService : ForegroundService() {
        return appDataRepository.tunnels.findByTunnelNetworksName(ssid).firstOrNull()
    }

+    private fun isTunnelDown(): Boolean {
+        return vpnService.vpnState.value.status == TunnelState.DOWN
+    }
+
    private suspend fun manageVpn() {
-        networkEventsFlow.collectLatest { watcherState ->
-            val autoTunnel = "Auto-tunnel watcher"
-            if (!watcherState.settings.isAutoTunnelPaused) {
-                //delay for rapid network state changes and then collect latest
-                delay(Constants.WATCHER_COLLECTION_DELAY)
-                when {
-                    watcherState.isEthernetConditionMet() -> {
-                        Timber.i("$autoTunnel - tunnel on on ethernet condition met")
-                        serviceManager.startVpnServiceForeground(this)
-                    }
-
-                    watcherState.isMobileDataConditionMet() -> {
-                        Timber.i("$autoTunnel - tunnel on on mobile data condition met")
-                        serviceManager.startVpnServiceForeground(this, getMobileDataTunnel()?.id)
-                    }
-
-                    watcherState.isTunnelNotMobileDataPreferredConditionMet() -> {
-                        getMobileDataTunnel()?.let {
-                            Timber.i("$autoTunnel - tunnel connected on mobile data is not preferred condition met, switching to preferred")
-                            serviceManager.startVpnServiceForeground(
-                                this,
-                                getMobileDataTunnel()?.id,
-                            )
+        val context = this
+        withContext(ioDispatcher) {
+            networkEventsFlow.collectLatest { watcherState ->
+                val autoTunnel = "Auto-tunnel watcher"
+                if (!watcherState.settings.isAutoTunnelPaused) {
+                    //delay for rapid network state changes and then collect latest
+                    delay(Constants.WATCHER_COLLECTION_DELAY)
+                    val tunnelConfig = vpnService.vpnState.value.tunnelConfig
+                    when {
+                        watcherState.isEthernetConditionMet() -> {
+                            Timber.i("$autoTunnel - tunnel on on ethernet condition met")
+                            if (isTunnelDown()) serviceManager.startVpnServiceForeground(context)
                        }
-                    }

-                    watcherState.isTunnelOffOnMobileDataConditionMet() -> {
-                        Timber.i("$autoTunnel - tunnel off on mobile data met, turning vpn off")
-                        serviceManager.stopVpnServiceForeground(this)
-                    }
-
-                    watcherState.isTunnelNotWifiNamePreferredMet(watcherState.currentNetworkSSID) -> {
-                        Timber.i("$autoTunnel - tunnel on ssid not associated with current tunnel condition met")
-                        getSsidTunnel(watcherState.currentNetworkSSID)?.let {
-                            Timber.i("Found tunnel associated with this SSID, bringing tunnel up")
-                            serviceManager.startVpnServiceForeground(this, it.id)
-                        } ?: suspend {
-                            Timber.i("No tunnel associated with this SSID, using defaults")
-                            if (appDataRepository.getPrimaryOrFirstTunnel()?.name != vpnService.name) {
-                                serviceManager.startVpnServiceForeground(this)
+                        watcherState.isMobileDataConditionMet() -> {
+                            Timber.i("$autoTunnel - tunnel on mobile data condition met")
+                            val mobileDataTunnel = getMobileDataTunnel()
+                            val tunnel =
+                                mobileDataTunnel ?: appDataRepository.getPrimaryOrFirstTunnel()
+                            if (isTunnelDown() || tunnelConfig?.isMobileDataTunnel == false) {
+                                serviceManager.startVpnServiceForeground(
+                                    context,
+                                    tunnel?.id,
+                                )
                            }
-                        }.invoke()
-                    }
+                        }

-                    watcherState.isUntrustedWifiConditionMet() -> {
-                        Timber.i("$autoTunnel - tunnel on untrusted wifi condition met")
-                        serviceManager.startVpnServiceForeground(
-                            this,
-                            getSsidTunnel(watcherState.currentNetworkSSID)?.id,
-                        )
-                    }
+                        watcherState.isTunnelOffOnMobileDataConditionMet() -> {
+                            Timber.i("$autoTunnel - tunnel off on mobile data met, turning vpn off")
+                            if (!isTunnelDown()) serviceManager.stopVpnServiceForeground(context)
+                        }

-                    watcherState.isTrustedWifiConditionMet() -> {
-                        Timber.i("$autoTunnel - tunnel off on trusted wifi condition met, turning vpn off")
-                        serviceManager.stopVpnServiceForeground(this)
-                    }
+                        watcherState.isUntrustedWifiConditionMet() -> {
+                            if (tunnelConfig?.tunnelNetworks?.contains(watcherState.currentNetworkSSID) == false ||
+                                tunnelConfig == null) {
+                                Timber.i("$autoTunnel - tunnel on ssid not associated with current tunnel condition met")
+                                getSsidTunnel(watcherState.currentNetworkSSID)?.let {
+                                    Timber.i("Found tunnel associated with this SSID, bringing tunnel up: ${it.name}")
+                                    if (isTunnelDown() || tunnelConfig?.id != it.id) serviceManager.startVpnServiceForeground(
+                                        context,
+                                        it.id,
+                                    )
+                                } ?: suspend {
+                                    Timber.i("No tunnel associated with this SSID, using defaults")
+                                    val default = appDataRepository.getPrimaryOrFirstTunnel()
+                                    if (default?.name != vpnService.name) {
+                                        default?.let {
+                                            serviceManager.startVpnServiceForeground(context, it.id)
+                                        }

-                    watcherState.isTunnelOffOnWifiConditionMet() -> {
-                        Timber.i("$autoTunnel - tunnel off on wifi condition met, turning vpn off")
-                        serviceManager.stopVpnServiceForeground(this)
-                    }
+                                    }
+                                }.invoke()
+                            }
+                        }

-                    watcherState.isTunnelOffOnNoConnectivityMet() -> {
-                        Timber.i("$autoTunnel - tunnel off on no connectivity met, turning vpn off")
-                        serviceManager.stopVpnServiceForeground(this)
-                    }
+                        watcherState.isTrustedWifiConditionMet() -> {
+                            Timber.i("$autoTunnel - tunnel off on trusted wifi condition met, turning vpn off")
+                            if (!isTunnelDown()) serviceManager.stopVpnServiceForeground(context)
+                        }

-                    else -> {
-                        Timber.i("$autoTunnel - no condition met")
+                        watcherState.isTunnelOffOnWifiConditionMet() -> {
+                            Timber.i("$autoTunnel - tunnel off on wifi condition met, turning vpn off")
+                            if (!isTunnelDown()) serviceManager.stopVpnServiceForeground(context)
+                        }
+
+                        watcherState.isTunnelOffOnNoConnectivityMet() -> {
+                            Timber.i("$autoTunnel - tunnel off on no connectivity met, turning vpn off")
+                            if (!isTunnelDown()) serviceManager.stopVpnServiceForeground(context)
+                        }
+
+                        else -> {
+                            Timber.i("$autoTunnel - no condition met")
+                        }
                    }
                }
            }
@@ -5,24 +5,25 @@ import android.content.Intent
 import android.os.Bundle
 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.repository.AppDataRepository
+import com.zaneschepke.wireguardautotunnel.module.IoDispatcher
+import com.zaneschepke.wireguardautotunnel.module.MainImmediateDispatcher
 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.statistics.TunnelStatistics
 import com.zaneschepke.wireguardautotunnel.service.tunnel.VpnService
 import com.zaneschepke.wireguardautotunnel.util.Constants
 import com.zaneschepke.wireguardautotunnel.util.handshakeStatus
 import com.zaneschepke.wireguardautotunnel.util.mapPeerStats
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.CancellationException
-import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import timber.log.Timber
 import javax.inject.Inject

@@ -39,13 +40,21 @@ class WireGuardTunnelService : ForegroundService() {
    @Inject
    lateinit var notificationService: NotificationService

+    @Inject
+    @MainImmediateDispatcher
+    lateinit var mainImmediateDispatcher: CoroutineDispatcher
+
+    @Inject
+    @IoDispatcher
+    lateinit var ioDispatcher: CoroutineDispatcher
+
    private var job: Job? = null

    private var didShowConnected = false

    override fun onCreate() {
        super.onCreate()
-        lifecycleScope.launch(Dispatchers.Main) {
+        lifecycleScope.launch(mainImmediateDispatcher) {
            //TODO fix this to not launch if AOVPN
            if (appDataRepository.tunnels.count() != 0) {
                launchVpnNotification()
@@ -57,7 +66,7 @@ class WireGuardTunnelService : ForegroundService() {
        super.startService(extras)
        cancelJob()
        job =
-            lifecycleScope.launch(Dispatchers.IO) {
+            lifecycleScope.launch {
                launch {
                    val tunnelId = extras?.getInt(Constants.TUNNEL_EXTRA_KEY)
                    if (vpnService.getState() == TunnelState.UP) {
@@ -77,39 +86,41 @@ class WireGuardTunnelService : ForegroundService() {

    //TODO improve tunnel notifications
    private suspend fun handshakeNotifications() {
-        var tunnelName: String? = null
-        vpnService.vpnState.collect { state ->
+        withContext(ioDispatcher) {
+            var tunnelName: String? = null
+            vpnService.vpnState.collect { state ->
                state.statistics
-                ?.mapPeerStats()
-                ?.map { it.value?.handshakeStatus() }
-                .let { statuses ->
-                    when {
-                        statuses?.all { it == HandshakeStatus.HEALTHY } == true -> {
-                            if (!didShowConnected) {
-                                delay(Constants.VPN_CONNECTED_NOTIFICATION_DELAY)
-                                tunnelName = state.tunnelConfig?.name
-                                launchVpnNotification(
-                                    getString(R.string.tunnel_start_title),
-                                    "${getString(R.string.tunnel_start_text)} - $tunnelName",
-                                )
-                                didShowConnected = true
+                    ?.mapPeerStats()
+                    ?.map { it.value?.handshakeStatus() }
+                    .let { statuses ->
+                        when {
+                            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",
+                                    )
+                                    didShowConnected = true
+                                }
                            }
-                        }

-                        statuses?.any { it == HandshakeStatus.STALE } == true -> {}
-                        statuses?.all { it == HandshakeStatus.NOT_STARTED } ==
-                            true -> {
-                        }
+                            statuses?.any { it == HandshakeStatus.STALE } == true -> {}
+                            statuses?.all { it == HandshakeStatus.NOT_STARTED } ==
+                                true -> {
+                            }

-                        else -> {}
+                            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",
+                    )
                }
-            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",
-                )
            }
        }
    }
@@ -123,7 +134,7 @@ class WireGuardTunnelService : ForegroundService() {

    override fun stopService() {
        super.stopService()
-        lifecycleScope.launch(Dispatchers.IO) {
+        lifecycleScope.launch {
            vpnService.stopTunnel()
            didShowConnected = false
        }
@@ -183,7 +194,7 @@ class WireGuardTunnelService : ForegroundService() {
    private fun cancelJob() {
        try {
            job?.cancel()
-        } catch (e : CancellationException) {
+        } catch (e: CancellationException) {
            Timber.i("Tunnel job cancelled")
        }
    }
@@ -10,6 +10,7 @@ import android.graphics.Color
 import androidx.core.app.NotificationCompat
 import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.ui.MainActivity
+import com.zaneschepke.wireguardautotunnel.ui.SplashActivity
 import dagger.hilt.android.qualifiers.ApplicationContext
 import javax.inject.Inject

@@ -59,7 +60,7 @@ class WireGuardNotification @Inject constructor(@ApplicationContext private val
                }
        notificationManager.createNotificationChannel(channel)
        val pendingIntent: PendingIntent =
-            Intent(context, MainActivity::class.java).let { notificationIntent ->
+            Intent(context, SplashActivity::class.java).let { notificationIntent ->
                PendingIntent.getActivity(
                    context,
                    0,
@@ -2,14 +2,14 @@ package com.zaneschepke.wireguardautotunnel.service.shortcut

 import android.os.Bundle
 import androidx.activity.ComponentActivity
-import com.zaneschepke.wireguardautotunnel.WireGuardAutoTunnel
 import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
+import com.zaneschepke.wireguardautotunnel.module.ApplicationScope
 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.CoroutineScope
 import kotlinx.coroutines.launch
 import javax.inject.Inject

@@ -22,9 +22,13 @@ class ShortcutsActivity : ComponentActivity() {
    @Inject
    lateinit var serviceManager: ServiceManager

+    @Inject
+    @ApplicationScope
+    lateinit var applicationScope: CoroutineScope
+
    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)
-        WireGuardAutoTunnel.applicationScope.launch(Dispatchers.IO) {
+        applicationScope.launch {
            val settings = appDataRepository.settings.getSettings()
            if (settings.isShortcutsEnabled) {
                when (intent.getStringExtra(CLASS_NAME_EXTRA_KEY)) {
@@ -3,21 +3,25 @@ package com.zaneschepke.wireguardautotunnel.service.tile
 import android.os.Build
 import android.service.quicksettings.Tile
 import android.service.quicksettings.TileService
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.ServiceLifecycleDispatcher
+import androidx.lifecycle.lifecycleScope
 import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
 import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
+import com.zaneschepke.wireguardautotunnel.module.ApplicationScope
+import com.zaneschepke.wireguardautotunnel.module.ServiceScope
 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() {
+class AutoTunnelControlTile : TileService(), LifecycleOwner {

    @Inject
    lateinit var appDataRepository: AppDataRepository
@@ -25,30 +29,28 @@ class AutoTunnelControlTile : TileService() {
    @Inject
    lateinit var serviceManager: ServiceManager

-    private val scope = CoroutineScope(Dispatchers.IO)
+    private val dispatcher = ServiceLifecycleDispatcher(this)

    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()
+        lifecycleScope.launch {
+            val settings = appDataRepository.settings.getSettings()
+            when (settings.isAutoTunnelEnabled) {
+                true -> {
+                    if (settings.isAutoTunnelPaused) {
+                        setInactive()
+                        setTileDescription(this@AutoTunnelControlTile.getString(R.string.paused))
+                    } else {
+                        setActive()
+                        setTileDescription(this@AutoTunnelControlTile.getString(R.string.active))
                    }
                }
+                false -> {
+                    setTileDescription(this@AutoTunnelControlTile.getString(R.string.disabled))
+                    setUnavailable()
+                }
            }
        }
    }
@@ -58,22 +60,13 @@ class AutoTunnelControlTile : TileService() {
        onStartListening()
    }

-    override fun onDestroy() {
-        super.onDestroy()
-        scope.cancel()
-    }
-
-    override fun onTileRemoved() {
-        super.onTileRemoved()
-        scope.cancel()
-    }
-
    override fun onClick() {
        super.onClick()
        unlockAndRun {
-            scope.launch {
+            lifecycleScope.launch {
                try {
                    appDataRepository.toggleWatcherServicePause()
+                    onStartListening()
                } catch (e: Exception) {
                    Timber.e(e.message)
                } finally {
@@ -108,4 +101,7 @@ class AutoTunnelControlTile : TileService() {
        }
        qsTile.updateTile()
    }
+
+    override val lifecycle: Lifecycle
+        get() = dispatcher.lifecycle
 }
@@ -3,21 +3,26 @@ package com.zaneschepke.wireguardautotunnel.service.tile
 import android.os.Build
 import android.service.quicksettings.Tile
 import android.service.quicksettings.TileService
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.LifecycleService
+import androidx.lifecycle.ServiceLifecycleDispatcher
+import androidx.lifecycle.lifecycleScope
 import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
 import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
+import com.zaneschepke.wireguardautotunnel.module.ApplicationScope
 import com.zaneschepke.wireguardautotunnel.service.foreground.ServiceManager
 import com.zaneschepke.wireguardautotunnel.service.tunnel.TunnelState
 import com.zaneschepke.wireguardautotunnel.service.tunnel.VpnService
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.launch
 import timber.log.Timber
 import javax.inject.Inject

@AndroidEntryPoint
-class TunnelControlTile : TileService() {
+class TunnelControlTile : TileService(), LifecycleOwner {

    @Inject
    lateinit var appDataRepository: AppDataRepository
@@ -28,47 +33,35 @@ class TunnelControlTile : TileService() {
    @Inject
    lateinit var serviceManager: ServiceManager

-    private val scope = CoroutineScope(Dispatchers.IO)
+    private val dispatcher = ServiceLifecycleDispatcher(this)

    private var manualStartConfig: TunnelConfig? = null

    override fun onStartListening() {
        super.onStartListening()
        Timber.d("On start listening called")
-        scope.launch {
-            vpnService.vpnState.collect { it ->
-                when (it.status) {
-                    TunnelState.UP -> {
-                        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()
+        lifecycleScope.launch {
+            when (vpnService.getState()) {
+                TunnelState.UP -> {
+                    setActive()
+                    setTileDescription(vpnService.name)
                }
+
+                TunnelState.DOWN -> {
+                    setInactive()
+                    val config = appDataRepository.getStartTunnelConfig()?.also { config ->
+                        manualStartConfig = config
+                    } ?: appDataRepository.getPrimaryOrFirstTunnel()
+                    config?.let {
+                        setTileDescription(it.name)
+                    } ?: setUnavailable()
+                }
+
+                else -> setInactive()
            }
        }
    }

-    override fun onDestroy() {
-        super.onDestroy()
-        scope.cancel()
-    }
-
-    override fun onTileRemoved() {
-        super.onTileRemoved()
-        scope.cancel()
-    }
-
    override fun onTileAdded() {
        super.onTileAdded()
        onStartListening()
@@ -77,7 +70,7 @@ class TunnelControlTile : TileService() {
    override fun onClick() {
        super.onClick()
        unlockAndRun {
-            scope.launch {
+            lifecycleScope.launch {
                try {
                    if (vpnService.getState() == TunnelState.UP) {
                        serviceManager.stopVpnServiceForeground(
@@ -123,4 +116,7 @@ class TunnelControlTile : TileService() {
        }
        qsTile.updateTile()
    }
+
+    override val lifecycle: Lifecycle
+        get() = dispatcher.lifecycle
 }
@@ -7,16 +7,16 @@ enum class TunnelState {
    DOWN,
    TOGGLE;

-    fun toWgState() : Tunnel.State {
-        return when(this) {
+    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) {
+    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
@@ -24,15 +24,16 @@ enum class TunnelState {
    }

    companion object {
-        fun from(state: Tunnel.State) : TunnelState {
-            return when(state) {
+        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) {
+
+        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
@@ -6,6 +6,8 @@ import com.wireguard.android.backend.Tunnel.State
 import com.zaneschepke.wireguardautotunnel.WireGuardAutoTunnel
 import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
 import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
+import com.zaneschepke.wireguardautotunnel.module.ApplicationScope
+import com.zaneschepke.wireguardautotunnel.module.IoDispatcher
 import com.zaneschepke.wireguardautotunnel.module.Kernel
 import com.zaneschepke.wireguardautotunnel.module.Userspace
 import com.zaneschepke.wireguardautotunnel.service.tunnel.statistics.AmneziaStatistics
@@ -13,55 +15,53 @@ import com.zaneschepke.wireguardautotunnel.service.tunnel.statistics.TunnelStati
 import com.zaneschepke.wireguardautotunnel.service.tunnel.statistics.WireGuardStatistics
 import com.zaneschepke.wireguardautotunnel.util.Constants
 import kotlinx.coroutines.CancellationException
+import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import org.amnezia.awg.backend.Tunnel
-import org.amnezia.awg.config.Config
 import timber.log.Timber
 import javax.inject.Inject
+import javax.inject.Provider

 class WireGuardTunnel
@Inject
 constructor(
-    private val userspaceAmneziaBackend : org.amnezia.awg.backend.Backend,
-    @Userspace private val userspaceBackend: Backend,
-    @Kernel private val kernelBackend: Backend,
+    private val userspaceAmneziaBackend: Provider<org.amnezia.awg.backend.Backend>,
+    @Userspace private val userspaceBackend: Provider<Backend>,
+    @Kernel private val kernelBackend: Provider<Backend>,
    private val appDataRepository: AppDataRepository,
+    @ApplicationScope private val applicationScope: CoroutineScope,
+    @IoDispatcher private val ioDispatcher: CoroutineDispatcher
 ) : VpnService {
    private val _vpnState = MutableStateFlow(VpnState())
    override val vpnState: StateFlow<VpnState> = _vpnState.asStateFlow()

-    private val scope = CoroutineScope(Dispatchers.IO)

    private var statsJob: Job? = null

-    private var backend: Backend = userspaceBackend
-
    private var backendIsWgUserspace = true

    private var backendIsAmneziaUserspace = false

    init {
-        scope.launch {
+        applicationScope.launch(ioDispatcher) {
            appDataRepository.settings.getSettingsFlow().collect {
                if (it.isKernelEnabled && (backendIsWgUserspace || backendIsAmneziaUserspace)) {
-                    Timber.d("Setting kernel backend")
-                    backend = kernelBackend
+                    Timber.i("Setting kernel backend")
                    backendIsWgUserspace = false
                    backendIsAmneziaUserspace = false
                } else if (!it.isKernelEnabled && !it.isAmneziaEnabled && !backendIsWgUserspace) {
-                    Timber.d("Setting WireGuard userspace backend")
-                    backend = userspaceBackend
+                    Timber.i("Setting WireGuard userspace backend")
                    backendIsWgUserspace = true
                    backendIsAmneziaUserspace = false
                } else if (it.isAmneziaEnabled && !backendIsAmneziaUserspace) {
-                    Timber.d("Setting Amnezia userspace backend")
+                    Timber.i("Setting Amnezia userspace backend")
                    backendIsAmneziaUserspace = true
                    backendIsWgUserspace = false
                }
@@ -69,21 +69,22 @@ constructor(
        }
    }

-    private fun setState(tunnelConfig: TunnelConfig?, tunnelState: TunnelState) : TunnelState {
-        return if(backendIsAmneziaUserspace) {
+    private fun setState(tunnelConfig: TunnelConfig?, tunnelState: TunnelState): TunnelState {
+        return if (backendIsAmneziaUserspace) {
            Timber.i("Using Amnezia backend")
            val config = tunnelConfig?.let {
-                if(it.amQuick != "") TunnelConfig.configFromAmQuick(it.amQuick) else {
+                if (it.amQuick != "") TunnelConfig.configFromAmQuick(it.amQuick) else {
                    Timber.w("Using backwards compatible wg config, amnezia specific config not found.")
                    TunnelConfig.configFromAmQuick(it.wgQuick)
                }
            }
-            val state = userspaceAmneziaBackend.setState(this, tunnelState.toAmState(), config)
+            val state =
+                userspaceAmneziaBackend.get().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(
+            val state = backend().setState(
                this,
                tunnelState.toWgState(),
                wgConfig,
@@ -93,20 +94,39 @@ constructor(
    }

    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)
+        return withContext(ioDispatcher) {
+            try {
+                //TODO we need better error handling here
+                // need to bubble up these errors to the UI
+                val config = tunnelConfig ?: appDataRepository.getPrimaryOrFirstTunnel()
+                if (config != null) {
+                    emitTunnelConfig(config)
+                    setState(config, TunnelState.UP)
+                } else throw Exception("No tunnels")
+            } catch (e: BackendException) {
+                Timber.e("Failed to start tunnel with error: ${e.message}")
+                TunnelState.from(State.DOWN)
+            }
        }
    }

-    private fun emitTunnelState(state : TunnelState) {
+    private fun backend(): Backend {
+        return when {
+            backendIsWgUserspace -> {
+                userspaceBackend.get()
+            }
+
+            !backendIsWgUserspace && !backendIsAmneziaUserspace -> {
+                kernelBackend.get()
+            }
+
+            else -> {
+                userspaceBackend.get()
+            }
+        }
+    }
+
+    private fun emitTunnelState(state: TunnelState) {
        _vpnState.tryEmit(
            _vpnState.value.copy(
                status = state,
@@ -130,22 +150,31 @@ constructor(
        )
    }

+    private fun resetVpnState() {
+        _vpnState.tryEmit(VpnState())
+    }
+
    override suspend fun stopTunnel() {
-        try {
-            if (getState() == TunnelState.UP) {
-                val state = setState(null, TunnelState.DOWN)
-                emitTunnelState(state)
+        withContext(ioDispatcher) {
+            try {
+                if (getState() == TunnelState.UP) {
+                    val state = setState(null, TunnelState.DOWN)
+                    resetVpnState()
+                    emitTunnelState(state)
+                }
+            } catch (e: BackendException) {
+                Timber.e("Failed to stop wireguard tunnel with error: ${e.message}")
+            } catch (e: org.amnezia.awg.backend.BackendException) {
+                Timber.e("Failed to stop amnezia tunnel with error: ${e.message}")
            }
-        } catch (e: BackendException) {
-            Timber.e("Failed to stop wireguard tunnel with error: ${e.message}")
-        } catch (e: org.amnezia.awg.backend.BackendException) {
-            Timber.e("Failed to stop amnezia tunnel with error: ${e.message}")
        }
    }

    override fun getState(): TunnelState {
-        return if(backendIsAmneziaUserspace) TunnelState.from(userspaceAmneziaBackend.getState(this))
-        else TunnelState.from(backend.getState(this))
+        return if (backendIsAmneziaUserspace) TunnelState.from(
+            userspaceAmneziaBackend.get().getState(this),
+        )
+        else TunnelState.from(backend().getState(this))
    }

    override fun getName(): String {
@@ -158,31 +187,35 @@ constructor(
    }

    private fun handleStateChange(state: TunnelState) {
-        val tunnel = this
        emitTunnelState(state)
-        WireGuardAutoTunnel.requestTunnelTileServiceStateUpdate(WireGuardAutoTunnel.instance)
+        WireGuardAutoTunnel.requestTunnelTileServiceStateUpdate()
        if (state == TunnelState.UP) {
-            statsJob =
-                scope.launch {
-                    while (true) {
-                        if(backendIsAmneziaUserspace) {
-                            emitBackendStatistics(AmneziaStatistics(userspaceAmneziaBackend.getStatistics(tunnel)))
-                        } else {
-                            emitBackendStatistics(WireGuardStatistics(backend.getStatistics(tunnel)))
-                        }
-                        delay(Constants.VPN_STATISTIC_CHECK_INTERVAL)
-                    }
-                }
+            statsJob = startTunnelStatisticsJob()
        }
        if (state == TunnelState.DOWN) {
            try {
                statsJob?.cancel()
-            } catch (e : CancellationException) {
+            } catch (e: CancellationException) {
                Timber.i("Stats job cancelled")
            }
        }
    }

+    private fun startTunnelStatisticsJob() = applicationScope.launch(ioDispatcher) {
+        while (true) {
+            if (backendIsAmneziaUserspace) {
+                emitBackendStatistics(
+                    AmneziaStatistics(
+                        userspaceAmneziaBackend.get().getStatistics(this@WireGuardTunnel),
+                    ),
+                )
+            } else {
+                emitBackendStatistics(WireGuardStatistics(backend().getStatistics(this@WireGuardTunnel)))
+            }
+            delay(Constants.VPN_STATISTIC_CHECK_INTERVAL)
+        }
+    }
+
    override fun onStateChange(state: State) {
        handleStateChange(TunnelState.from(state))
    }
@@ -11,7 +11,7 @@ class AmneziaStatistics(private val statistics: Statistics) : TunnelStatistics()
            PeerStats(
                rxBytes = stats.rxBytes,
                txBytes = stats.txBytes,
-                latestHandshakeEpochMillis = stats.latestHandshakeEpochMillis
+                latestHandshakeEpochMillis = stats.latestHandshakeEpochMillis,
            )
        }
    }
@@ -2,17 +2,17 @@ package com.zaneschepke.wireguardautotunnel.service.tunnel.statistics

 import org.amnezia.awg.crypto.Key

-abstract class TunnelStatistics  {
+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 isTunnelStale(): Boolean

    abstract fun getPeers(): Array<Key>

-    abstract fun rx() : Long
+    abstract fun rx(): Long

-    abstract fun tx() : Long
+    abstract fun tx(): Long
 }
@@ -3,7 +3,7 @@ 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()  {
+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)
@@ -11,7 +11,7 @@ class WireGuardStatistics(private val statistics: Statistics) : TunnelStatistics
            PeerStats(
                txBytes = peerStats.txBytes,
                rxBytes = peerStats.rxBytes,
-                latestHandshakeEpochMillis = peerStats.latestHandshakeEpochMillis
+                latestHandshakeEpochMillis = peerStats.latestHandshakeEpochMillis,
            )
        }
    }
@@ -1,30 +1,19 @@
 package com.zaneschepke.wireguardautotunnel.ui

-import android.app.Application
 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.journeyapps.barcodescanner.BarcodeEncoder
 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
@@ -52,7 +41,7 @@ constructor() : ViewModel() {
    private fun requestPermissions() {
        _appUiState.update {
            it.copy(
-                requestPermissions = true
+                requestPermissions = true,
            )
        }
    }
@@ -60,12 +49,12 @@ constructor() : ViewModel() {
    fun permissionsRequested() {
        _appUiState.update {
            it.copy(
-                requestPermissions = false
+                requestPermissions = false,
            )
        }
    }

-    fun openWebPage(url: String, context : Context) {
+    fun openWebPage(url: String, context: Context) {
        try {
            val webpage: Uri = Uri.parse(url)
            val intent = Intent(Intent.ACTION_VIEW, webpage).apply {
@@ -81,7 +70,7 @@ constructor() : ViewModel() {
    fun onVpnPermissionAccepted() {
        _appUiState.update {
            it.copy(
-                vpnPermissionAccepted = true
+                vpnPermissionAccepted = true,
            )
        }
    }
@@ -124,33 +113,6 @@ constructor() : ViewModel() {
        }
    }

-    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(
@@ -1,5 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.ui
-
-import com.journeyapps.barcodescanner.CaptureActivity
-
-class CaptureActivityPortrait : CaptureActivity()
@@ -32,21 +32,24 @@ import androidx.compose.ui.unit.dp
 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.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.WireGuardAutoTunnel
-import com.zaneschepke.wireguardautotunnel.data.datastore.DataStoreManager
+import com.zaneschepke.wireguardautotunnel.data.repository.AppStateRepository
 import com.zaneschepke.wireguardautotunnel.data.repository.SettingsRepository
 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
@@ -58,14 +61,13 @@ import com.zaneschepke.wireguardautotunnel.util.StringValue
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
-import xyz.teamgravity.pin_lock_compose.PinManager
 import javax.inject.Inject

@AndroidEntryPoint
 class MainActivity : AppCompatActivity() {

    @Inject
-    lateinit var dataStoreManager: DataStoreManager
+    lateinit var appStateRepository: AppStateRepository

    @Inject
    lateinit var settingsRepository: SettingsRepository
@@ -79,17 +81,18 @@ class MainActivity : AppCompatActivity() {
    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)

+        val isPinLockEnabled = intent.extras?.getBoolean(SplashActivity.IS_PIN_LOCK_ENABLED_KEY)
+
        enableEdgeToEdge(navigationBarStyle = SystemBarStyle.dark(Color.Transparent.toArgb()))

-        // load preferences into memory and init data
        lifecycleScope.launch {
-            dataStoreManager.init()
-            WireGuardAutoTunnel.requestTunnelTileServiceStateUpdate(this@MainActivity)
+            WireGuardAutoTunnel.requestTunnelTileServiceStateUpdate()
            val settings = settingsRepository.getSettings()
            if (settings.isAutoTunnelEnabled) {
                serviceManager.startWatcherService(application.applicationContext)
            }
        }
+
        setContent {
            val appViewModel = hiltViewModel<AppViewModel>()
            val appUiState by appViewModel.appUiState.collectAsStateWithLifecycle()
@@ -140,7 +143,7 @@ class MainActivity : AppCompatActivity() {
                    if (!appUiState.vpnPermissionAccepted) {
                        return@LaunchedEffect appViewModel.vpnIntent?.let {
                            vpnActivityResultState.launch(
-                                it
+                                it,
                            )
                        }!!
                    }
@@ -152,7 +155,6 @@ class MainActivity : AppCompatActivity() {
                    appViewModel.setNotificationPermissionAccepted(
                        notificationPermissionState?.status?.isGranted ?: true,
                    )
-                    if (!WireGuardAutoTunnel.isRunningOnAndroidTv()) appViewModel.readLogCatOutput()
                }

                LaunchedEffect(appUiState.snackbarMessageConsumed) {
@@ -199,10 +201,8 @@ class MainActivity : AppCompatActivity() {
                ) { padding ->
                    NavHost(
                        navController,
-                        startDestination =
-                        (if (PinManager.pinExists()) Screen.Lock.route else Screen.Main.route),
-                        modifier =
-                        Modifier
+                        startDestination = (if (isPinLockEnabled == true) Screen.Lock.route else Screen.Main.route),
+                        modifier = Modifier
                            .padding(padding)
                            .fillMaxSize(),
                    ) {
@@ -234,16 +234,33 @@ class MainActivity : AppCompatActivity() {
                            )
                        }
                        composable(Screen.Support.Logs.route) {
-                            LogsScreen(appViewModel)
+                            LogsScreen()
                        }
-                        composable("${Screen.Config.route}/{id}") {
+                        composable(
+                            "${Screen.Config.route}/{id}?configType={configType}",
+                            arguments =
+                            listOf(
+                                navArgument("id") {
+                                    type = NavType.StringType
+                                    defaultValue = "0"
+                                },
+                                navArgument("configType") {
+                                    type = NavType.StringType
+                                    defaultValue = ConfigType.WIREGUARD.name
+                                },
+                            ),
+                        ) {
                            val id = it.arguments?.getString("id")
+                            val configType = ConfigType.valueOf(
+                                it.arguments?.getString("configType") ?: ConfigType.WIREGUARD.name,
+                            )
                            if (!id.isNullOrBlank()) {
                                ConfigScreen(
                                    navController = navController,
                                    tunnelId = id,
                                    appViewModel = appViewModel,
                                    focusRequester = focusRequester,
+                                    configType = configType,
                                )
                            }
                        }
@@ -4,11 +4,9 @@ import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.rounded.Home
 import androidx.compose.material.icons.rounded.QuestionMark
 import androidx.compose.material.icons.rounded.Settings
-import androidx.compose.ui.res.stringResource
 import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.WireGuardAutoTunnel
 import com.zaneschepke.wireguardautotunnel.ui.common.navigation.BottomNavItem
-import com.zaneschepke.wireguardautotunnel.util.StringValue

 sealed class Screen(val route: String) {
    data object Main : Screen("main") {
@@ -0,0 +1,68 @@
+package com.zaneschepke.wireguardautotunnel.ui
+
+import android.annotation.SuppressLint
+import android.content.Intent
+import android.os.Build
+import android.os.Bundle
+import androidx.activity.ComponentActivity
+import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.repeatOnLifecycle
+import com.zaneschepke.logcatter.LocalLogCollector
+import com.zaneschepke.wireguardautotunnel.WireGuardAutoTunnel
+import com.zaneschepke.wireguardautotunnel.WireGuardAutoTunnel.Companion.isRunningOnAndroidTv
+import com.zaneschepke.wireguardautotunnel.data.repository.AppStateRepository
+import com.zaneschepke.wireguardautotunnel.module.ApplicationScope
+import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.launch
+import xyz.teamgravity.pin_lock_compose.PinManager
+import javax.inject.Inject
+
+@SuppressLint("CustomSplashScreen")
+@AndroidEntryPoint
+class SplashActivity : ComponentActivity() {
+
+    @Inject
+    lateinit var appStateRepository: AppStateRepository
+
+    @Inject
+    lateinit var localLogCollector: LocalLogCollector
+
+    @Inject
+    @ApplicationScope
+    lateinit var applicationScope: CoroutineScope
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+            val splashScreen = installSplashScreen()
+            splashScreen.setKeepOnScreenCondition { true }
+        }
+        super.onCreate(savedInstanceState)
+
+        applicationScope.launch {
+            if (!isRunningOnAndroidTv()) localLogCollector.start()
+        }
+
+        lifecycleScope.launch {
+            repeatOnLifecycle(Lifecycle.State.CREATED) {
+                val pinLockEnabled = appStateRepository.isPinLockEnabled()
+                if (pinLockEnabled) {
+                    PinManager.initialize(WireGuardAutoTunnel.instance)
+                }
+
+                val intent = Intent(this@SplashActivity, MainActivity::class.java).apply {
+                    putExtra(IS_PIN_LOCK_ENABLED_KEY, pinLockEnabled)
+                }
+                startActivity(intent)
+                finish()
+            }
+        }
+    }
+
+    companion object {
+        const val IS_PIN_LOCK_ENABLED_KEY = "is_pin_lock_enabled"
+    }
+}
+
@@ -15,6 +15,9 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
+import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.focus.focusRequester
+import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import com.zaneschepke.wireguardautotunnel.service.tunnel.statistics.TunnelStatistics
@@ -30,11 +33,12 @@ fun RowListItem(
    onClick: () -> Unit,
    rowButton: @Composable () -> Unit,
    expanded: Boolean,
-    statistics: TunnelStatistics?
+    statistics: TunnelStatistics?,
+    focusRequester: FocusRequester,
 ) {
    Box(
        modifier =
-        Modifier
+        Modifier.focusRequester(focusRequester)
            .animateContentSize()
            .clip(RoundedCornerShape(30.dp))
            .combinedClickable(
@@ -52,9 +56,10 @@ fun RowListItem(
            ) {
                Row(
                    verticalAlignment = Alignment.CenterVertically,
+                    modifier = Modifier.fillMaxWidth(13 / 20f),
                ) {
                    icon()
-                    Text(text)
+                    Text(text, maxLines = 1, overflow = TextOverflow.Ellipsis)
                }
                rowButton()
            }
@@ -44,19 +44,21 @@ fun SearchBar(onQuery: (queryString: String) -> Unit) {
            onQuery(onQueryChanged)
        },
        leadingIcon = {
+            val icon = Icons.Rounded.Search
            Icon(
-                imageVector = Icons.Rounded.Search,
+                imageVector = icon,
                tint = MaterialTheme.colorScheme.onBackground,
-                contentDescription = stringResource(id = R.string.search_icon),
+                contentDescription = icon.name,
            )
        },
        trailingIcon = {
            if (showClearIcon) {
                IconButton(onClick = { query = "" }) {
+                    val icon = Icons.Rounded.Clear
                    Icon(
-                        imageVector = Icons.Rounded.Clear,
+                        imageVector = icon,
                        tint = MaterialTheme.colorScheme.onBackground,
-                        contentDescription = stringResource(id = R.string.clear_icon),
+                        contentDescription = icon.name,
                    )
                }
            }
@@ -28,12 +28,15 @@ fun ConfigurationToggle(
        verticalAlignment = Alignment.CenterVertically,
        horizontalArrangement = Arrangement.SpaceBetween,
    ) {
-        Text(label, textAlign = TextAlign.Start, modifier = Modifier
-            .weight(
-                weight = 1.0f,
-                fill = false,
-            ),
-            softWrap = true)
+        Text(
+            label, textAlign = TextAlign.Start,
+            modifier = Modifier
+                .weight(
+                    weight = 1.0f,
+                    fill = false,
+                ),
+            softWrap = true,
+        )
        Switch(
            modifier = modifier,
            enabled = enabled,
@@ -79,9 +79,9 @@ 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.Result
+import com.zaneschepke.wireguardautotunnel.util.getMessage
 import kotlinx.coroutines.delay

@SuppressLint("UnusedMaterial3ScaffoldPaddingParameter")
@@ -94,7 +94,8 @@ fun ConfigScreen(
    focusRequester: FocusRequester,
    navController: NavController,
    appViewModel: AppViewModel,
-    tunnelId: String
+    tunnelId: String,
+    configType: ConfigType
 ) {
    val context = LocalContext.current
    val clipboardManager: ClipboardManager = LocalClipboardManager.current
@@ -148,11 +149,11 @@ fun ConfigScreen(
            },
            onError = {
                showAuthPrompt = false
-                appViewModel.showSnackbarMessage(Event.Error.AuthenticationFailed.message)
+                appViewModel.showSnackbarMessage(context.getString(R.string.error_authentication_failed))
            },
            onFailure = {
                showAuthPrompt = false
-                appViewModel.showSnackbarMessage(Event.Error.AuthorizationFailed.message)
+                appViewModel.showSnackbarMessage(context.getString(R.string.error_authorization_failed))
            },
        )
    }
@@ -319,15 +320,11 @@ fun ConfigScreen(
                    }
                },
                onClick = {
-                    viewModel.onSaveAllChanges().let {
-                        when (it) {
-                            is Result.Success -> {
-                                appViewModel.showSnackbarMessage(it.data.message)
-                                navController.navigate(Screen.Main.route)
-                            }
-
-                            is Result.Error -> appViewModel.showSnackbarMessage(it.error.message)
-                        }
+                    viewModel.onSaveAllChanges(configType).onSuccess {
+                        appViewModel.showSnackbarMessage(context.getString(R.string.config_changes_saved))
+                        navController.navigate(Screen.Main.route)
+                    }.onFailure {
+                        appViewModel.showSnackbarMessage(it.getMessage(context))
                    }
                },
                containerColor = fobColor,
@@ -486,7 +483,7 @@ fun ConfigScreen(
                                modifier = Modifier.width(IntrinsicSize.Min),
                            )
                        }
-                        if(uiState.isAmneziaEnabled) {
+                        if (configType == ConfigType.AMNEZIA) {
                            ConfigurationTextBox(
                                value = uiState.interfaceProxy.junkPacketCount,
                                onValueChange = { value -> viewModel.onJunkPacketCountChanged(value) },
@@ -499,7 +496,11 @@ fun ConfigScreen(
                            )
                            ConfigurationTextBox(
                                value = uiState.interfaceProxy.junkPacketMinSize,
-                                onValueChange = { value -> viewModel.onJunkPacketMinSizeChanged(value) },
+                                onValueChange = { value ->
+                                    viewModel.onJunkPacketMinSizeChanged(
+                                        value,
+                                    )
+                                },
                                keyboardActions = keyboardActions,
                                label = stringResource(R.string.junk_packet_minimum_size),
                                hint = stringResource(R.string.junk_packet_minimum_size).lowercase(),
@@ -509,7 +510,11 @@ fun ConfigScreen(
                            )
                            ConfigurationTextBox(
                                value = uiState.interfaceProxy.junkPacketMaxSize,
-                                onValueChange = { value -> viewModel.onJunkPacketMaxSizeChanged(value) },
+                                onValueChange = { value ->
+                                    viewModel.onJunkPacketMaxSizeChanged(
+                                        value,
+                                    )
+                                },
                                keyboardActions = keyboardActions,
                                label = stringResource(R.string.junk_packet_maximum_size),
                                hint = stringResource(R.string.junk_packet_maximum_size).lowercase(),
@@ -519,7 +524,11 @@ fun ConfigScreen(
                            )
                            ConfigurationTextBox(
                                value = uiState.interfaceProxy.initPacketJunkSize,
-                                onValueChange = { value -> viewModel.onInitPacketJunkSizeChanged(value) },
+                                onValueChange = { value ->
+                                    viewModel.onInitPacketJunkSizeChanged(
+                                        value,
+                                    )
+                                },
                                keyboardActions = keyboardActions,
                                label = stringResource(R.string.init_packet_junk_size),
                                hint = stringResource(R.string.init_packet_junk_size).lowercase(),
@@ -549,7 +558,11 @@ fun ConfigScreen(
                            )
                            ConfigurationTextBox(
                                value = uiState.interfaceProxy.responsePacketMagicHeader,
-                                onValueChange = { value -> viewModel.onResponsePacketMagicHeader(value) },
+                                onValueChange = { value ->
+                                    viewModel.onResponsePacketMagicHeader(
+                                        value,
+                                    )
+                                },
                                keyboardActions = keyboardActions,
                                label = stringResource(R.string.response_packet_magic_header),
                                hint = stringResource(R.string.response_packet_magic_header).lowercase(),
@@ -558,21 +571,29 @@ fun ConfigScreen(
                                    .focusRequester(focusRequester),
                            )
                            ConfigurationTextBox(
-                                value = uiState.interfaceProxy.transportPacketMagicHeader,
-                                onValueChange = { value -> viewModel.onTransportPacketMagicHeader(value) },
+                                value = uiState.interfaceProxy.underloadPacketMagicHeader,
+                                onValueChange = { value ->
+                                    viewModel.onUnderloadPacketMagicHeader(
+                                        value,
+                                    )
+                                },
                                keyboardActions = keyboardActions,
-                                label = stringResource(R.string.transport_packet_magic_header),
-                                hint = stringResource(R.string.transport_packet_magic_header).lowercase(),
+                                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.underloadPacketMagicHeader,
-                                onValueChange = { value -> viewModel.onUnderloadPacketMagicHeader(value) },
+                                value = uiState.interfaceProxy.transportPacketMagicHeader,
+                                onValueChange = { value ->
+                                    viewModel.onTransportPacketMagicHeader(
+                                        value,
+                                    )
+                                },
                                keyboardActions = keyboardActions,
-                                label = stringResource(R.string.underload_packet_magic_header),
-                                hint = stringResource(R.string.underload_packet_magic_header).lowercase(),
+                                label = stringResource(R.string.transport_packet_magic_header),
+                                hint = stringResource(R.string.transport_packet_magic_header).lowercase(),
                                modifier = Modifier
                                    .fillMaxWidth()
                                    .focusRequester(focusRequester),
@@ -19,7 +19,7 @@ data class ConfigUiState(
    val isAmneziaEnabled: Boolean = false
 ) {
    companion object {
-        fun from(config : Config) : ConfigUiState {
+        fun from(config: Config): ConfigUiState {
            val proxyPeers = config.peers.map { PeerProxy.from(it) }
            val proxyInterface = InterfaceProxy.from(config.`interface`)
            var include = true
@@ -43,7 +43,8 @@ data class ConfigUiState(
                isAllApplicationsEnabled,
            )
        }
-        fun from(config: org.amnezia.awg.config.Config) : ConfigUiState {
+
+        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`)
@@ -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,19 +11,22 @@ 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.domain.TunnelConfig
 import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
 import com.zaneschepke.wireguardautotunnel.data.repository.SettingsRepository
+import com.zaneschepke.wireguardautotunnel.module.IoDispatcher
 import com.zaneschepke.wireguardautotunnel.ui.screens.config.model.PeerProxy
+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.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.CoroutineDispatcher
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.update
@@ -36,18 +38,18 @@ import javax.inject.Inject
 class ConfigViewModel
@Inject
 constructor(
-    private val application: Application,
    private val settingsRepository: SettingsRepository,
-    private val appDataRepository: AppDataRepository
+    private val appDataRepository: AppDataRepository,
+    @IoDispatcher private val ioDispatcher: CoroutineDispatcher
 ) : ViewModel() {

-    private val packageManager = application.packageManager
+    private val packageManager = WireGuardAutoTunnel.instance.packageManager

    private val _uiState = MutableStateFlow(ConfigUiState())
    val uiState = _uiState.asStateFlow()

    fun init(tunnelId: String) =
-        viewModelScope.launch(Dispatchers.IO) {
+        viewModelScope.launch(ioDispatcher) {
            val packages = getQueriedPackages("")
            val state =
                if (tunnelId != Constants.MANUAL_TUNNEL_CONFIG_ID) {
@@ -56,15 +58,16 @@ constructor(
                            .firstOrNull { it.id.toString() == tunnelId }
                    val isAmneziaEnabled = settingsRepository.getSettings().isAmneziaEnabled
                    if (tunnelConfig != null) {
-                        (if(isAmneziaEnabled) {
-                            val amConfig = if(tunnelConfig.amQuick == "") tunnelConfig.wgQuick else tunnelConfig.amQuick
+                        (if (isAmneziaEnabled) {
+                            val amConfig =
+                                if (tunnelConfig.amQuick == "") tunnelConfig.wgQuick else tunnelConfig.amQuick
                            ConfigUiState.from(TunnelConfig.configFromAmQuick(amConfig))
                        } else ConfigUiState.from(TunnelConfig.configFromWgQuick(tunnelConfig.wgQuick))).copy(
                            packages = packages,
                            loading = false,
                            tunnel = tunnelConfig,
                            tunnelName = tunnelConfig.name,
-                            isAmneziaEnabled = isAmneziaEnabled
+                            isAmneziaEnabled = isAmneziaEnabled,
                        )
                    } else {
                        ConfigUiState(loading = false, packages = packages)
@@ -108,7 +111,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> {
@@ -137,7 +140,7 @@ constructor(
        viewModelScope.launch {
            if (tunnelConfig != null) {
                saveConfig(tunnelConfig).join()
-                WireGuardAutoTunnel.requestTunnelTileServiceStateUpdate(application)
+                WireGuardAutoTunnel.requestTunnelTileServiceStateUpdate()
            }
        }

@@ -206,69 +209,93 @@ constructor(
        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()) {
+        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.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.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.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.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.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.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.transportPacketMagicHeader.isNotEmpty()) {
+            builder.setTransportPacketMagicHeader(
+                _uiState.value.interfaceProxy.transportPacketMagicHeader.trim().toLong(),
+            )
        }
-        if(_uiState.value.interfaceProxy.underloadPacketMagicHeader.isNotEmpty()) {
-            builder.setUnderloadPacketMagicHeader(_uiState.value.interfaceProxy.underloadPacketMagicHeader.trim().toLong())
+        if (_uiState.value.interfaceProxy.underloadPacketMagicHeader.isNotEmpty()) {
+            builder.setUnderloadPacketMagicHeader(
+                _uiState.value.interfaceProxy.underloadPacketMagicHeader.trim().toLong(),
+            )
        }
        return builder.build()
    }

-    private fun buildConfig() : Config {
+    private fun buildConfig(): Config {
        val peerList = buildPeerListFromProxyPeers()
        val wgInterface = buildInterfaceListFromProxyInterface()
-        return  Config.Builder().addPeers(peerList).setInterface(wgInterface).build()
+        return Config.Builder().addPeers(peerList).setInterface(wgInterface).build()
    }

-    private fun buildAmConfig() : org.amnezia.awg.config.Config {
+    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()
+        return org.amnezia.awg.config.Config.Builder().addPeers(peerList).setInterface(amInterface)
+            .build()
    }

-    fun onSaveAllChanges(): Result<Event> {
+    fun onSaveAllChanges(configType: ConfigType): Result<Unit> {
        return try {
-            val config = buildConfig()
+            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 = config.toWgQuickString(),
+                    wgQuick = wgQuick,
+                    amQuick = amQuick,
                )
+
                else -> uiState.value.tunnel!!.copy(
                    name = _uiState.value.tunnelName,
-                    wgQuick = config.toWgQuickString(),
-                    amQuick = if(uiState.value.isAmneziaEnabled) buildAmConfig().toAwgQuickString()
-                    else _uiState.value.tunnel?.amQuick ?: ""
+                    wgQuick = wgQuick,
+                    amQuick = amQuick,
                )
            }
            updateTunnelConfig(tunnelConfig)
-            Result.Success(Event.Message.ConfigSaved)
+            Result.success(Unit)
        } catch (e: Exception) {
            Timber.e(e)
            val message = e.message?.substringAfter(":", missingDelimiterValue = "")
-            Result.Error(Event.Error.ConfigParseError(message ?: ""))
+            val stringValue = message?.let {
+                StringValue.DynamicString(message)
+            } ?: StringValue.StringResource(R.string.unknown_error)
+            Result.failure(WgTunnelExceptions.ConfigParseError(stringValue))
        }
    }

@@ -424,14 +451,15 @@ constructor(
    fun onJunkPacketCountChanged(value: String) {
        _uiState.update {
            it.copy(
-                interfaceProxy = _uiState.value.interfaceProxy.copy(junkPacketCount = value)
+                interfaceProxy = _uiState.value.interfaceProxy.copy(junkPacketCount = value),
            )
        }
    }
+
    fun onJunkPacketMinSizeChanged(value: String) {
        _uiState.update {
            it.copy(
-                interfaceProxy = _uiState.value.interfaceProxy.copy(junkPacketMinSize = value)
+                interfaceProxy = _uiState.value.interfaceProxy.copy(junkPacketMinSize = value),
            )
        }
    }
@@ -439,7 +467,7 @@ constructor(
    fun onJunkPacketMaxSizeChanged(value: String) {
        _uiState.update {
            it.copy(
-                interfaceProxy = _uiState.value.interfaceProxy.copy(junkPacketMaxSize = value)
+                interfaceProxy = _uiState.value.interfaceProxy.copy(junkPacketMaxSize = value),
            )
        }
    }
@@ -447,7 +475,7 @@ constructor(
    fun onInitPacketJunkSizeChanged(value: String) {
        _uiState.update {
            it.copy(
-                interfaceProxy = _uiState.value.interfaceProxy.copy(initPacketJunkSize = value)
+                interfaceProxy = _uiState.value.interfaceProxy.copy(initPacketJunkSize = value),
            )
        }
    }
@@ -455,7 +483,7 @@ constructor(
    fun onResponsePacketJunkSize(value: String) {
        _uiState.update {
            it.copy(
-                interfaceProxy = _uiState.value.interfaceProxy.copy(responsePacketJunkSize = value)
+                interfaceProxy = _uiState.value.interfaceProxy.copy(responsePacketJunkSize = value),
            )
        }
    }
@@ -463,7 +491,7 @@ constructor(
    fun onInitPacketMagicHeader(value: String) {
        _uiState.update {
            it.copy(
-                interfaceProxy = _uiState.value.interfaceProxy.copy(initPacketMagicHeader = value)
+                interfaceProxy = _uiState.value.interfaceProxy.copy(initPacketMagicHeader = value),
            )
        }
    }
@@ -471,7 +499,7 @@ constructor(
    fun onResponsePacketMagicHeader(value: String) {
        _uiState.update {
            it.copy(
-                interfaceProxy = _uiState.value.interfaceProxy.copy(responsePacketMagicHeader = value)
+                interfaceProxy = _uiState.value.interfaceProxy.copy(responsePacketMagicHeader = value),
            )
        }
    }
@@ -479,7 +507,7 @@ constructor(
    fun onTransportPacketMagicHeader(value: String) {
        _uiState.update {
            it.copy(
-                interfaceProxy = _uiState.value.interfaceProxy.copy(transportPacketMagicHeader = value)
+                interfaceProxy = _uiState.value.interfaceProxy.copy(transportPacketMagicHeader = value),
            )
        }
    }
@@ -487,7 +515,7 @@ constructor(
    fun onUnderloadPacketMagicHeader(value: String) {
        _uiState.update {
            it.copy(
-                interfaceProxy = _uiState.value.interfaceProxy.copy(underloadPacketMagicHeader = value)
+                interfaceProxy = _uiState.value.interfaceProxy.copy(underloadPacketMagicHeader = value),
            )
        }
    }
@@ -35,7 +35,8 @@ data class InterfaceProxy(
                mtu = if (i.mtu.isPresent) i.mtu.get().toString().trim() else "",
            )
        }
-        fun from(i: org.amnezia.awg.config.Interface) : InterfaceProxy {
+
+        fun from(i: org.amnezia.awg.config.Interface): InterfaceProxy {
            return InterfaceProxy(
                publicKey = i.keyPair.publicKey.toBase64().trim(),
                privateKey = i.keyPair.privateKey.toBase64().trim(),
@@ -48,15 +49,24 @@ data class InterfaceProxy(
                    ""
                },
                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 "",
-                underloadPacketMagicHeader = if(i.underloadPacketMagicHeader.isPresent) i.underloadPacketMagicHeader.get().toString() else "",
-                transportPacketMagicHeader = if(i.transportPacketMagicHeader.isPresent) i.transportPacketMagicHeader.get().toString() 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 "",
            )
        }
    }
@@ -35,7 +35,7 @@ data class PeerProxy(
            )
        }

-        fun from(peer: org.amnezia.awg.config.Peer) : PeerProxy {
+        fun from(peer: org.amnezia.awg.config.Peer): PeerProxy {
            return PeerProxy(
                publicKey = peer.publicKey.toBase64(),
                preSharedKey =
@@ -0,0 +1,6 @@
+package com.zaneschepke.wireguardautotunnel.ui.screens.main
+
+enum class ConfigType {
+    AMNEZIA,
+    WIREGUARD
+}
@@ -14,6 +14,7 @@ import androidx.compose.animation.slideInVertically
 import androidx.compose.animation.slideOutVertically
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.clickable
+import androidx.compose.foundation.focusGroup
 import androidx.compose.foundation.focusable
 import androidx.compose.foundation.gestures.ScrollableDefaults
 import androidx.compose.foundation.gestures.detectTapGestures
@@ -34,7 +35,6 @@ 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
@@ -46,7 +46,6 @@ import androidx.compose.material.icons.rounded.Star
 import androidx.compose.material3.AlertDialog
 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
@@ -71,7 +70,6 @@ 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.geometry.Offset
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.hapticfeedback.HapticFeedbackType
@@ -91,6 +89,10 @@ 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.zaneschepke.wireguardautotunnel.R
@@ -99,23 +101,17 @@ 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
 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.Result
+import com.zaneschepke.wireguardautotunnel.util.getMessage
 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
-import java.util.Timer

@SuppressLint("UnusedMaterial3ScaffoldPaddingParameter")
@OptIn(ExperimentalMaterial3Api::class, ExperimentalFoundationApi::class)
@@ -129,10 +125,11 @@ fun MainScreen(
    val haptic = LocalHapticFeedback.current
    val context = LocalContext.current
    val isVisible = rememberSaveable { mutableStateOf(true) }
-    val scope = rememberCoroutineScope { Dispatchers.IO }
+    val scope = rememberCoroutineScope()

    val sheetState = rememberModalBottomSheetState()
    var showBottomSheet by remember { mutableStateOf(false) }
+    var configType by remember { mutableStateOf(ConfigType.WIREGUARD) }

    // Nested scroll for control FAB
    val nestedScrollConnection = remember {
@@ -193,7 +190,7 @@ fun MainScreen(
                                name.startsWith(Constants.ANDROID_TV_EXPLORER_STUB)
                        }
                    ) {
-                        appViewModel.showSnackbarMessage(Event.Error.FileExplorerRequired.message)
+                        appViewModel.showSnackbarMessage(context.getString(R.string.error_no_file_explorer))
                    }
                    return intent
                }
@@ -201,11 +198,8 @@ fun MainScreen(
        ) { data ->
            if (data == null) return@rememberLauncherForActivityResult
            scope.launch {
-                viewModel.onTunnelFileSelected(data).let {
-                    when (it) {
-                        is Result.Error -> appViewModel.showSnackbarMessage(it.error.message)
-                        is Result.Success -> {}
-                    }
+                viewModel.onTunnelFileSelected(data, configType, context).onFailure {
+                    appViewModel.showSnackbarMessage(it.getMessage(context))
                }
            }
        }
@@ -215,11 +209,8 @@ fun MainScreen(
            onResult = {
                if (it.contents != null) {
                    scope.launch {
-                        viewModel.onTunnelQrResult(it.contents).let { result ->
-                            when (result) {
-                                is Result.Success -> {}
-                                is Result.Error -> appViewModel.showSnackbarMessage(result.error.message)
-                            }
+                        viewModel.onTunnelQrResult(it.contents, configType).onFailure { error ->
+                            appViewModel.showSnackbarMessage(error.getMessage(context))
                        }
                    }
                }
@@ -232,7 +223,7 @@ fun MainScreen(
            confirmButton = {
                TextButton(
                    onClick = {
-                        selectedTunnel?.let { viewModel.onDelete(it) }
+                        selectedTunnel?.let { viewModel.onDelete(it, context) }
                        showDeleteTunnelAlertDialog = false
                        selectedTunnel = null
                    },
@@ -252,7 +243,9 @@ fun MainScreen(

    fun onTunnelToggle(checked: Boolean, tunnel: TunnelConfig) {
        if (appViewModel.isRequiredPermissionGranted()) {
-            if (checked) viewModel.onTunnelStart(tunnel) else viewModel.onTunnelStop()
+            if (checked) viewModel.onTunnelStart(tunnel, context) else viewModel.onTunnelStop(
+                context,
+            )
        }
    }

@@ -260,10 +253,21 @@ fun MainScreen(
        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)
+        scanLauncher.launch(scanOptions)
+    }
+
    Scaffold(
        modifier =
        Modifier.pointerInput(Unit) {
-            if(uiState.tunnels.isNotEmpty()) {
+            if (uiState.tunnels.isNotEmpty()) {
                detectTapGestures(
                    onTap = {
                        selectedTunnel = null
@@ -278,39 +282,77 @@ fun MainScreen(
                visible = isVisible.value,
                enter = slideInVertically(initialOffsetY = { it * 2 }),
                exit = slideOutVertically(targetOffsetY = { it * 2 }),
+                modifier = Modifier
+                    .focusRequester(focusRequester)
+                    .focusGroup(),
            ) {
                val secondaryColor = MaterialTheme.colorScheme.secondary
-                val hoverColor = MaterialTheme.colorScheme.surfaceColorAtElevation(2.dp)
-                var fobColor by remember { mutableStateOf(secondaryColor) }
-                FloatingActionButton(
-                    modifier =
-                    (if (
-                        WireGuardAutoTunnel.isRunningOnAndroidTv() &&
-                        uiState.tunnels.isEmpty()
-                    )
-                        Modifier.focusRequester(focusRequester)
-                    else Modifier)
-                        .onFocusChanged {
-                            if (WireGuardAutoTunnel.isRunningOnAndroidTv()) {
-                                fobColor = if (it.isFocused) hoverColor else secondaryColor
-                            }
-                        },
-                    onClick = { showBottomSheet = true },
-                    containerColor = fobColor,
+                val tvFobColor = MaterialTheme.colorScheme.surfaceColorAtElevation(2.dp)
+                val fobColor =
+                    if (WireGuardAutoTunnel.isRunningOnAndroidTv()) tvFobColor else secondaryColor
+                val fobIconColor =
+                    if (WireGuardAutoTunnel.isRunningOnAndroidTv()) Color.White else MaterialTheme.colorScheme.background
+                MultiFloatingActionButton(
+                    fabIcon = FabIcon(
+                        iconRes = R.drawable.add,
+                        iconResAfterRotate = R.drawable.close,
+                        iconRotate = 180f,
+                    ),
+                    fabOption = FabOption(
+                        iconTint = fobIconColor,
+                        backgroundTint = fobColor,
+                    ),
+                    itemsMultiFab = listOf(
+                        MultiFabItem(
+                            label = {
+                                Text(
+                                    stringResource(id = R.string.amnezia),
+                                    color = Color.White,
+                                    textAlign = TextAlign.Center,
+                                    modifier = Modifier.padding(end = 10.dp),
+                                )
+                            },
+                            modifier = Modifier
+                                .size(40.dp),
+                            icon = R.drawable.add,
+                            value = ConfigType.AMNEZIA.name,
+                            miniFabOption = FabOption(
+                                backgroundTint = fobColor,
+                                fobIconColor,
+                            ),
+                        ),
+                        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,
+                            miniFabOption = FabOption(
+                                backgroundTint = fobColor,
+                                fobIconColor,
+                            ),
+                        ),
+                    ),
+                    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,
-                    )
-                }
+                )
            }
        },
    ) {
        if (showBottomSheet) {
            ModalBottomSheet(
-                onDismissRequest = { showBottomSheet = false },
+                onDismissRequest = {
+                    showBottomSheet = false
+
+                },
                sheetState = sheetState,
            ) {
                // Sheet content
@@ -343,16 +385,7 @@ fun MainScreen(
                            .clickable {
                                scope.launch {
                                    showBottomSheet = false
-                                    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)
+                                    launchQrScanner()
                                }
                            }
                            .padding(10.dp),
@@ -376,7 +409,7 @@ fun MainScreen(
                        .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),
@@ -408,40 +441,55 @@ fun MainScreen(
            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()) {
+                    uiState.tunnels.isEmpty(), exit = fadeOut(), enter = fadeIn(),
+                ) {
                    Column(
                        horizontalAlignment = Alignment.CenterHorizontally,
                        verticalArrangement = Arrangement.Center,
-                        modifier = Modifier.padding(top = 100.dp)
+                        modifier = Modifier
+                            .padding(top = 100.dp)
+                            .fillMaxSize(),
                    ) {
-                        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)
+                        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(".")
+                        }
+                        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 itemFocusRequester = remember { FocusRequester() }
                    val autoTunnelingLabel = buildAnnotatedString {
                        append(stringResource(id = R.string.auto_tunneling))
                        append(": ")
@@ -469,22 +517,29 @@ fun MainScreen(
                        rowButton = {
                            if (uiState.settings.isAutoTunnelPaused) {
                                TextButton(
+                                    modifier = Modifier.focusRequester(itemFocusRequester),
                                    onClick = { viewModel.resumeAutoTunneling() },
                                ) {
                                    Text(stringResource(id = R.string.resume))
                                }
                            } else {
                                TextButton(
+                                    modifier = Modifier.focusRequester(itemFocusRequester),
                                    onClick = { viewModel.pauseAutoTunneling() },
                                ) {
                                    Text(stringResource(id = R.string.pause))
                                }
                            }
                        },
-                        onClick = {},
+                        onClick = {
+                            if (WireGuardAutoTunnel.isRunningOnAndroidTv()) {
+                                itemFocusRequester.requestFocus()
+                            }
+                        },
                        onHold = {},
                        expanded = false,
                        statistics = null,
+                        focusRequester = focusRequester
                    )
                }
            }
@@ -515,6 +570,7 @@ fun MainScreen(
                    } else {
                        Color.Gray
                    })
+                val itemFocusRequester = remember { FocusRequester() }
                val expanded = remember { mutableStateOf(false) }
                RowListItem(
                    icon = {
@@ -538,13 +594,13 @@ fun MainScreen(
                                .size(if (icon == circleIcon) 15.dp else 20.dp),
                        )
                    },
-                    text = tunnel.name.truncateWithEllipsis(Constants.ALLOWED_DISPLAY_NAME_LENGTH),
+                    text = tunnel.name,
                    onHold = {
                        if (
                            (uiState.vpnState.status == TunnelState.UP) &&
                            (tunnel.name == uiState.vpnState.tunnelConfig?.name)
                        ) {
-                            appViewModel.showSnackbarMessage(Event.Message.TunnelOffAction.message)
+                            appViewModel.showSnackbarMessage(context.getString(R.string.turn_off_tunnel))
                            return@RowListItem
                        }
                        haptic.performHapticFeedback(HapticFeedbackType.LongPress)
@@ -560,11 +616,12 @@ fun MainScreen(
                            }
                        } else {
                            selectedTunnel = tunnel
-                            focusRequester.requestFocus()
+                            itemFocusRequester.requestFocus()
                        }
                    },
                    statistics = uiState.vpnState.statistics,
                    expanded = expanded.value,
+                    focusRequester = focusRequester,
                    rowButton = {
                        if (
                            tunnel.id == selectedTunnel?.id &&
@@ -578,7 +635,7 @@ fun MainScreen(
                                            !uiState.settings.isAutoTunnelPaused
                                        ) {
                                            appViewModel.showSnackbarMessage(
-                                                Event.Message.AutoTunnelOffAction.message,
+                                                context.getString(R.string.turn_off_tunnel),
                                            )
                                        } else {
                                            navController.navigate(
@@ -620,7 +677,7 @@ fun MainScreen(
                            @Composable
                            fun TunnelSwitch() =
                                Switch(
-                                    modifier = Modifier.focusRequester(focusRequester),
+                                    modifier = Modifier.focusRequester(itemFocusRequester),
                                    checked = checked,
                                    onCheckedChange = { checked ->
                                        if (!checked) expanded.value = false
@@ -631,9 +688,9 @@ fun MainScreen(
                                Row {
                                    IconButton(
                                        onClick = {
-                                            if (uiState.settings.isAutoTunnelEnabled) {
+                                            if (uiState.settings.isAutoTunnelEnabled && !uiState.settings.isAutoTunnelPaused) {
                                                appViewModel.showSnackbarMessage(
-                                                    Event.Message.AutoTunnelOffAction.message,
+                                                    context.getString(R.string.turn_off_auto),
                                                )
                                            } else {
                                                selectedTunnel = tunnel
@@ -659,7 +716,7 @@ fun MainScreen(
                                                expanded.value = !expanded.value
                                            } else {
                                                appViewModel.showSnackbarMessage(
-                                                    Event.Message.TunnelOnAction.message,
+                                                    context.getString(R.string.turn_on_tunnel),
                                                )
                                            }
                                        },
@@ -680,7 +737,7 @@ fun MainScreen(
                                                tunnel.name == uiState.vpnState.tunnelConfig?.name
                                            ) {
                                                appViewModel.showSnackbarMessage(
-                                                    Event.Message.TunnelOffAction.message,
+                                                    context.getString(R.string.turn_off_tunnel),
                                                )
                                            } else {
                                                selectedTunnel = tunnel
@@ -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
@@ -12,14 +11,15 @@ import com.zaneschepke.wireguardautotunnel.WireGuardAutoTunnel
 import com.zaneschepke.wireguardautotunnel.data.domain.Settings
 import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
 import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
+import com.zaneschepke.wireguardautotunnel.module.IoDispatcher
 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.CoroutineDispatcher
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.stateIn
@@ -34,10 +34,10 @@ import javax.inject.Inject
 class MainViewModel
@Inject
 constructor(
-    private val application: Application,
    private val appDataRepository: AppDataRepository,
    private val serviceManager: ServiceManager,
-    val vpnService: VpnService
+    val vpnService: VpnService,
+    @IoDispatcher private val ioDispatcher: CoroutineDispatcher
 ) : ViewModel() {

    val uiState =
@@ -54,21 +54,20 @@ constructor(
                MainUiState(),
            )

-    private fun stopWatcherService() =
-        viewModelScope.launch(Dispatchers.IO) {
-            serviceManager.stopWatcherService(application.applicationContext)
-        }
+    private fun stopWatcherService(context: Context) {
+        serviceManager.stopWatcherService(context)
+    }

-    fun onDelete(tunnel: TunnelConfig) {
-        viewModelScope.launch(Dispatchers.IO) {
+    fun onDelete(tunnel: TunnelConfig, context: Context) {
+        viewModelScope.launch {
            val settings = appDataRepository.settings.getSettings()
            val isPrimary = tunnel.isPrimaryTunnel
            if (appDataRepository.tunnels.count() == 1 || isPrimary) {
-                stopWatcherService()
+                stopWatcherService(context)
                resetTunnelSetting(settings)
            }
            appDataRepository.tunnels.delete(tunnel)
-            WireGuardAutoTunnel.requestTunnelTileServiceStateUpdate(application)
+            WireGuardAutoTunnel.requestTunnelTileServiceStateUpdate()
        }
    }

@@ -81,124 +80,251 @@ constructor(
        )
    }

-    fun onTunnelStart(tunnelConfig: TunnelConfig) =
-        viewModelScope.launch(Dispatchers.IO) {
+    fun onTunnelStart(tunnelConfig: TunnelConfig, context: Context) =
+        viewModelScope.launch {
            Timber.d("On start called!")
            serviceManager.startVpnService(
-                application.applicationContext,
+                context,
                tunnelConfig.id,
                isManualStart = true,
            )
        }


-    fun onTunnelStop() =
-        viewModelScope.launch(Dispatchers.IO) {
+    fun onTunnelStop(context: Context) =
+        viewModelScope.launch {
            Timber.i("Stopping active tunnel")
-            serviceManager.stopVpnService(application.applicationContext, isManualStop = true)
+            serviceManager.stopVpnService(context, isManualStop = true)
        }

-    private fun validateConfigString(config: String) {
-        TunnelConfig.configFromWgQuick(config)
+    private fun validateConfigString(config: String, configType: ConfigType) {
+        when (configType) {
+            ConfigType.AMNEZIA -> TunnelConfig.configFromAmQuick(config)
+            ConfigType.WIREGUARD -> TunnelConfig.configFromWgQuick(config)
+        }
    }

-    suspend fun onTunnelQrResult(result: String): Result<Unit> {
+    private fun generateQrCodeDefaultName(config: String, configType: ConfigType): String {
        return try {
-            validateConfigString(result)
-            val tunnelConfig =
-                TunnelConfig(name = NumberUtils.generateRandomTunnelName(), wgQuick = result)
-            addTunnel(tunnelConfig)
-            Result.Success(Unit)
-        } catch (e: Exception) {
-            Timber.e(e)
-            Result.Error(Event.Error.InvalidQrCode)
-        }
-    }
-
-    private suspend fun saveTunnelConfigFromStream(stream: InputStream, fileName: String) {
-        val bufferReader = stream.bufferedReader(charset = Charsets.UTF_8)
-        val config = Config.parse(bufferReader)
-        val tunnelName = getNameFromFileName(fileName)
-        addTunnel(TunnelConfig(name = tunnelName, wgQuick = config.toWgQuickString()))
-        withContext(Dispatchers.IO) { stream.close() }
-    }
-
-    private fun getInputStreamFromUri(uri: Uri): InputStream? {
-        return application.applicationContext.contentResolver.openInputStream(uri)
-    }
-
-    suspend fun onTunnelFileSelected(uri: Uri): Result<Unit> {
-        try {
-            if (isValidUriContentScheme(uri)) {
-                val fileName = getFileName(application.applicationContext, uri)
-                when (getFileExtensionFromFileName(fileName)) {
-                    Constants.CONF_FILE_EXTENSION ->
-                        saveTunnelFromConfUri(fileName, uri).let {
-                            when (it) {
-                                is Result.Error -> return Result.Error(Event.Error.FileReadFailed)
-                                is Result.Success -> return it
-                            }
-                        }
-
-                    Constants.ZIP_FILE_EXTENSION -> saveTunnelsFromZipUri(uri)
-                    else -> return Result.Error(Event.Error.InvalidFileExtension)
+            when (configType) {
+                ConfigType.AMNEZIA -> {
+                    TunnelConfig.configFromAmQuick(config).peers[0].endpoint.get().host
+                }
+
+                ConfigType.WIREGUARD -> {
+                    TunnelConfig.configFromWgQuick(config).peers[0].endpoint.get().host
                }
-                return Result.Success(Unit)
-            } else {
-                return Result.Error(Event.Error.InvalidFileExtension)
            }
        } catch (e: Exception) {
            Timber.e(e)
-            return Result.Error(Event.Error.FileReadFailed)
+            NumberUtils.generateRandomTunnelName()
        }
    }

-    private suspend fun saveTunnelsFromZipUri(uri: Uri) {
-        ZipInputStream(getInputStreamFromUri(uri)).use { zip ->
-            generateSequence { zip.nextEntry }
-                .filterNot {
-                    it.isDirectory ||
-                        getFileExtensionFromFileName(it.name) != Constants.CONF_FILE_EXTENSION
-                }
-                .forEach {
-                    val name = getNameFromFileName(it.name)
-                    val config = Config.parse(zip)
-                    viewModelScope.launch(Dispatchers.IO) {
-                        addTunnel(TunnelConfig(name = name, wgQuick = config.toWgQuickString()))
+    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 withContext(ioDispatcher) {
+            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)
+            } catch (e: Exception) {
+                Timber.e(e)
+                Result.failure(WgTunnelExceptions.InvalidQrCode())
+            }
        }
    }

-    private suspend fun saveTunnelFromConfUri(name: String, uri: Uri): Result<Unit> {
-        val stream = getInputStreamFromUri(uri)
-        return if (stream != null) {
-            saveTunnelConfigFromStream(stream, name)
-            Result.Success(Unit)
-        } else {
-            Result.Error(Event.Error.FileReadFailed)
+    private suspend fun makeTunnelNameUnique(name: String): String {
+        return withContext(ioDispatcher) {
+            val tunnels = appDataRepository.tunnels.getAll()
+            var tunnelName = name
+            var num = 1
+            while (tunnels.any { it.name == tunnelName }) {
+                tunnelName = name + "(${num})"
+                num++
+            }
+            tunnelName
        }
    }

-    private suspend fun addTunnel(tunnelConfig: TunnelConfig) {
+    private fun saveTunnelConfigFromStream(
+        stream: InputStream,
+        fileName: String,
+        type: ConfigType
+    ) {
+        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()
+                }
+            }
+        }
+        viewModelScope.launch {
+            val tunnelName = makeTunnelNameUnique(getNameFromFileName(fileName))
+            addTunnel(
+                TunnelConfig(
+                    name = tunnelName,
+                    wgQuick = wgQuick,
+                    amQuick = amQuick ?: TunnelConfig.AM_QUICK_DEFAULT,
+                ),
+            )
+        }
+    }
+
+    private fun getInputStreamFromUri(uri: Uri, context: Context): InputStream? {
+        return context.applicationContext.contentResolver.openInputStream(uri)
+    }
+
+    suspend fun onTunnelFileSelected(
+        uri: Uri,
+        configType: ConfigType,
+        context: Context
+    ): Result<Unit> {
+        return withContext(ioDispatcher) {
+            try {
+                if (isValidUriContentScheme(uri)) {
+                    val fileName = getFileName(context, uri)
+                    return@withContext when (getFileExtensionFromFileName(fileName)) {
+                        Constants.CONF_FILE_EXTENSION ->
+                            saveTunnelFromConfUri(fileName, uri, configType, context)
+
+                        Constants.ZIP_FILE_EXTENSION -> saveTunnelsFromZipUri(
+                            uri,
+                            configType,
+                            context,
+                        )
+
+                        else -> Result.failure(WgTunnelExceptions.InvalidFileExtension())
+                    }
+                } else {
+                    Result.failure(WgTunnelExceptions.InvalidFileExtension())
+                }
+            } catch (e: Exception) {
+                Timber.e(e)
+                Result.failure(WgTunnelExceptions.FileReadFailed())
+            }
+        }
+    }
+
+    private suspend fun saveTunnelsFromZipUri(
+        uri: Uri,
+        configType: ConfigType,
+        context: Context
+    ): Result<Unit> {
+        return withContext(ioDispatcher) {
+            ZipInputStream(getInputStreamFromUri(uri, context)).use { zip ->
+                generateSequence { zip.nextEntry }
+                    .filterNot {
+                        it.isDirectory ||
+                            getFileExtensionFromFileName(it.name) != Constants.CONF_FILE_EXTENSION
+                    }
+                    .forEach {
+                        val name = getNameFromFileName(it.name)
+                        withContext(viewModelScope.coroutineContext) {
+                            try {
+                                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,
+        configType: ConfigType,
+        context: Context
+    ): Result<Unit> {
+        return withContext(ioDispatcher) {
+            val stream = getInputStreamFromUri(uri, context)
+            return@withContext if (stream != null) {
+                try {
+                    saveTunnelConfigFromStream(stream, name, configType)
+                } catch (e: Exception) {
+                    return@withContext Result.failure(WgTunnelExceptions.ConfigParseError())
+                }
+                Result.success(Unit)
+            } else {
+                Result.failure(WgTunnelExceptions.FileReadFailed())
+            }
+        }
+    }
+
+    private fun addTunnel(tunnelConfig: TunnelConfig) = viewModelScope.launch {
        val firstTunnel = appDataRepository.tunnels.count() == 0
        saveTunnel(tunnelConfig)
-        if (firstTunnel) WireGuardAutoTunnel.requestTunnelTileServiceStateUpdate(application)
+        if (firstTunnel) WireGuardAutoTunnel.requestTunnelTileServiceStateUpdate()
    }

    fun pauseAutoTunneling() =
        viewModelScope.launch {
            appDataRepository.settings.save(uiState.value.settings.copy(isAutoTunnelPaused = true))
-            WireGuardAutoTunnel.requestAutoTunnelTileServiceUpdate(application)
+            WireGuardAutoTunnel.requestAutoTunnelTileServiceUpdate()
        }

    fun resumeAutoTunneling() =
        viewModelScope.launch {
            appDataRepository.settings.save(uiState.value.settings.copy(isAutoTunnelPaused = false))
-            WireGuardAutoTunnel.requestAutoTunnelTileServiceUpdate(application)
+            WireGuardAutoTunnel.requestAutoTunnelTileServiceUpdate()
        }

-    private suspend fun saveTunnel(tunnelConfig: TunnelConfig) {
+    private fun saveTunnel(tunnelConfig: TunnelConfig) = viewModelScope.launch {
        appDataRepository.tunnels.save(tunnelConfig)
    }

@@ -239,17 +365,17 @@ 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) { appDataRepository.settings.save(settings) }
+        viewModelScope.launch { appDataRepository.settings.save(settings) }


    fun onCopyTunnel(tunnel: TunnelConfig?) = viewModelScope.launch {
@@ -1,17 +1,22 @@
 package com.zaneschepke.wireguardautotunnel.ui.screens.options

+import android.annotation.SuppressLint
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.slideInVertically
+import androidx.compose.animation.slideOutVertically
 import androidx.compose.foundation.clickable
+import androidx.compose.foundation.focusGroup
 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.Row
 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.layout.size
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.text.KeyboardActions
@@ -24,9 +29,10 @@ 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.TextButton
+import androidx.compose.material3.surfaceColorAtElevation
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
@@ -39,15 +45,21 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.focus.focusRequester
 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
@@ -55,11 +67,13 @@ 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.Result
+import com.zaneschepke.wireguardautotunnel.util.getMessage
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch

+@SuppressLint("UnusedMaterial3ScaffoldPaddingParameter")
@OptIn(ExperimentalLayoutApi::class)
@Composable
 fun OptionsScreen(
@@ -71,6 +85,8 @@ fun OptionsScreen(
 ) {
    val scrollState = rememberScrollState()
    val uiState by optionsViewModel.uiState.collectAsStateWithLifecycle()
+    val context = LocalContext.current
+
    val interactionSource = remember { MutableInteractionSource() }
    val scope = rememberCoroutineScope()
    val focusManager = LocalFocusManager.current
@@ -90,196 +106,252 @@ fun OptionsScreen(
    fun saveTrustedSSID() {
        if (currentText.isNotEmpty()) {
            scope.launch {
-                optionsViewModel.onSaveRunSSID(currentText).let {
-                    when (it) {
-                        is Result.Success -> currentText = ""
-                        is Result.Error -> appViewModel.showSnackbarMessage(it.error.message)
-                    }
+                optionsViewModel.onSaveRunSSID(currentText).onSuccess {
+                    currentText = ""
+                }.onFailure {
+                    appViewModel.showSnackbarMessage(it.getMessage(context))
                }
            }
        }
    }

-    Column(
-        horizontalAlignment = Alignment.CenterHorizontally,
-        verticalArrangement = Arrangement.Top,
-        modifier =
-        Modifier
-            .fillMaxSize()
-            .verticalScroll(scrollState)
-            .clickable(
-                indication = null,
-                interactionSource = interactionSource,
+    Scaffold(
+        floatingActionButton = {
+            val secondaryColor = MaterialTheme.colorScheme.secondary
+            val tvFobColor = MaterialTheme.colorScheme.surfaceColorAtElevation(2.dp)
+            val fobColor =
+                if (WireGuardAutoTunnel.isRunningOnAndroidTv()) tvFobColor else secondaryColor
+            val fobIconColor =
+                if (WireGuardAutoTunnel.isRunningOnAndroidTv()) Color.White else MaterialTheme.colorScheme.background
+            AnimatedVisibility(
+                visible = true,
+                enter = slideInVertically(initialOffsetY = { it * 2 }),
+                exit = slideOutVertically(targetOffsetY = { it * 2 }),
+                modifier = Modifier
+                    .focusRequester(focusRequester)
+                    .focusGroup(),
            ) {
-                focusManager.clearFocus()
-            },
+                MultiFloatingActionButton(
+                    fabIcon = FabIcon(
+                        iconRes = R.drawable.edit,
+                        iconResAfterRotate = R.drawable.close,
+                        iconRotate = 180f,
+                    ),
+                    fabOption = FabOption(
+                        iconTint = fobIconColor,
+                        backgroundTint = fobColor,
+                    ),
+                    itemsMultiFab = listOf(
+                        MultiFabItem(
+                            label = {
+                                Text(
+                                    stringResource(id = R.string.amnezia),
+                                    color = Color.White,
+                                    textAlign = TextAlign.Center,
+                                    modifier = Modifier.padding(end = 10.dp),
+                                )
+                            },
+                            modifier = Modifier
+                                .size(40.dp),
+                            icon = R.drawable.edit,
+                            value = ConfigType.AMNEZIA.name,
+                            miniFabOption = FabOption(
+                                backgroundTint = fobColor,
+                                fobIconColor,
+                            ),
+                        ),
+                        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,
+                            miniFabOption = FabOption(
+                                backgroundTint = fobColor,
+                                fobIconColor,
+                            ),
+                        ),
+                    ),
+                    onFabItemClicked = {
+                        val configType = ConfigType.valueOf(it.value)
+                        navController.navigate(
+                            "${Screen.Config.route}/${tunnelId}?configType=${configType.name}",
+                        )
+                    },
+                    shape = RoundedCornerShape(16.dp),
+                )
+            }
+        },
    ) {
-        Surface(
-            tonalElevation = 2.dp,
-            shadowElevation = 2.dp,
-            shape = RoundedCornerShape(12.dp),
-            color = MaterialTheme.colorScheme.surface,
+        Column(
+            horizontalAlignment = Alignment.CenterHorizontally,
+            verticalArrangement = Arrangement.Top,
            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() },
-                )
-                Row(
-                    verticalAlignment = Alignment.CenterVertically,
-                    modifier = Modifier
-                        .fillMaxSize()
-                        .padding(top = 5.dp),
-                    horizontalArrangement = Arrangement.Center,
+            Modifier
+                .fillMaxSize()
+                .verticalScroll(scrollState)
+                .clickable(
+                    indication = null,
+                    interactionSource = interactionSource,
                ) {
-                    TextButton(
-                        onClick = {
-                            navController.navigate(
-                                "${Screen.Config.route}/${tunnelId}",
-                            )
-                        },
-                    ) {
-                        Text(stringResource(R.string.edit_tunnel))
-                    }
+                    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),
+            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),
            ) {
-                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,
-                                    )
-                                }
-                            }
-                        },
+                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,
+                                        )
+                                    }
+                                }
+                            },
+                        )
+                    }
                }
            }
        }
@@ -7,10 +7,8 @@ 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.Event
-import com.zaneschepke.wireguardautotunnel.util.Result
+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
@@ -46,12 +44,12 @@ constructor(
    fun init(tunnelId: String) {
        _optionState.update {
            it.copy(
-                id = tunnelId
+                id = tunnelId,
            )
        }
    }

-    fun onDeleteRunSSID(ssid: String) = viewModelScope.launch(Dispatchers.IO) {
+    fun onDeleteRunSSID(ssid: String) = viewModelScope.launch {
        uiState.value.tunnel?.let {
            appDataRepository.tunnels.save(
                tunnelConfig = it.copy(
@@ -61,7 +59,7 @@ constructor(
        }
    }

-    private fun saveTunnel(tunnelConfig: TunnelConfig?) = viewModelScope.launch(Dispatchers.IO) {
+    private fun saveTunnel(tunnelConfig: TunnelConfig?) = viewModelScope.launch {
        tunnelConfig?.let {
            appDataRepository.tunnels.save(it)
        }
@@ -76,13 +74,13 @@ constructor(
            tunnelsWithName.isEmpty()) {
            uiState.value.tunnel?.tunnelNetworks?.add(trimmed)
            saveTunnel(uiState.value.tunnel)
-            Result.Success(Unit)
+            Result.success(Unit)
        } else {
-            Result.Error(Event.Error.SsidConflict)
+            Result.failure(WgTunnelExceptions.SsidConflict())
        }
    }

-    fun onToggleIsMobileDataTunnel() = viewModelScope.launch(Dispatchers.IO) {
+    fun onToggleIsMobileDataTunnel() = viewModelScope.launch {
        uiState.value.tunnel?.let {
            if (it.isMobileDataTunnel) {
                appDataRepository.tunnels.updateMobileDataTunnel(null)
@@ -90,7 +88,7 @@ constructor(
        }
    }

-    fun onTogglePrimaryTunnel() = viewModelScope.launch(Dispatchers.IO) {
+    fun onTogglePrimaryTunnel() = viewModelScope.launch {
        if (uiState.value.tunnel != null) {
            appDataRepository.tunnels.updatePrimaryTunnel(
                when (uiState.value.isDefaultTunnel) {
@@ -98,7 +96,7 @@ constructor(
                    false -> uiState.value.tunnel
                },
            )
-            WireGuardAutoTunnel.requestTunnelTileServiceStateUpdate(WireGuardAutoTunnel.instance)
+            WireGuardAutoTunnel.requestTunnelTileServiceStateUpdate()
        }
    }
 }
@@ -44,6 +44,7 @@ import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextButton
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.SideEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
@@ -70,10 +71,9 @@ 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
@@ -81,13 +81,9 @@ 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.text.SectionTitle
-import com.zaneschepke.wireguardautotunnel.util.Event
-import com.zaneschepke.wireguardautotunnel.util.FileUtils
-import com.zaneschepke.wireguardautotunnel.util.Result
-import kotlinx.coroutines.Dispatchers
+import com.zaneschepke.wireguardautotunnel.util.getMessage
 import kotlinx.coroutines.launch
 import timber.log.Timber
-import xyz.teamgravity.pin_lock_compose.PinManager
 import java.io.File

@OptIn(
@@ -101,14 +97,14 @@ fun SettingsScreen(
    navController: NavController,
    focusRequester: FocusRequester,
 ) {
-    val scope = rememberCoroutineScope { Dispatchers.IO }
    val context = LocalContext.current
    val focusManager = LocalFocusManager.current
+    val scope = rememberCoroutineScope()
    val scrollState = rememberScrollState()
    val interactionSource = remember { MutableInteractionSource() }
-    val pinExists = remember { mutableStateOf(PinManager.pinExists()) }

    val uiState by viewModel.uiState.collectAsStateWithLifecycle()
+    val kernelSupport by viewModel.kernelSupport.collectAsStateWithLifecycle()

    val fineLocationState = rememberPermissionState(Manifest.permission.ACCESS_FINE_LOCATION)
    var currentText by remember { mutableStateOf("") }
@@ -120,6 +116,10 @@ fun SettingsScreen(
    val screenPadding = 5.dp
    val fillMaxWidth = .85f

+    LaunchedEffect(Unit) {
+        viewModel.checkKernelSupport()
+    }
+
    val startForResult =
        rememberLauncherForActivityResult(ActivityResultContracts.StartActivityForResult()) { result: ActivityResult ->
            if (result.resultCode == Activity.RESULT_OK) {
@@ -131,16 +131,32 @@ fun SettingsScreen(

    fun exportAllConfigs() {
        try {
-            val files = uiState.tunnels.map { File(context.cacheDir, "${it.name}.conf") }
-            files.forEachIndexed { index, file ->
-                file.outputStream().use { it.write(uiState.tunnels[index].wgQuick.toByteArray()) }
+            val wgFiles = uiState.tunnels.map { config ->
+                val file = File(context.cacheDir, "${config.name}-wg.conf")
+                file.outputStream().use {
+                    it.write(config.wgQuick.toByteArray())
+                }
+                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
+            }
+            scope.launch {
+                viewModel.onExportTunnels(wgFiles + amFiles).onFailure {
+                    appViewModel.showSnackbarMessage(it.getMessage(context))
+                }.onSuccess {
+                    didExportFiles = true
+                    appViewModel.showSnackbarMessage(context.getString(R.string.exported_configs_message))
+                }
            }
-            FileUtils.saveFilesToZip(context, files)
-            didExportFiles = true
-            appViewModel.showSnackbarMessage(Event.Message.ConfigsExported.message)
        } catch (e: Exception) {
            Timber.e(e)
-            appViewModel.showSnackbarMessage(Event.Error.Exception(e).message)
        }
    }

@@ -161,7 +177,7 @@ fun SettingsScreen(
    fun handleAutoTunnelToggle() {
        if (uiState.isBatteryOptimizeDisableShown || isBatteryOptimizationsDisabled()) {
            if (appViewModel.isRequiredPermissionGranted()) {
-                viewModel.onToggleAutoTunnel()
+                viewModel.onToggleAutoTunnel(context)
            }
        } else {
            requestBatteryOptimizationsDisabled()
@@ -170,21 +186,18 @@ fun SettingsScreen(

    fun saveTrustedSSID() {
        if (currentText.isNotEmpty()) {
-            viewModel.onSaveTrustedSSID(currentText).let {
-                when (it) {
-                    is Result.Success -> currentText = ""
-                    is Result.Error -> appViewModel.showSnackbarMessage(it.error.message)
-                }
+            viewModel.onSaveTrustedSSID(currentText).onSuccess {
+                currentText = ""
+            }.onFailure {
+                appViewModel.showSnackbarMessage(it.getMessage(context))
            }
        }
    }

    fun openSettings() {
-        scope.launch {
-            val intentSettings = Intent(ACTION_APPLICATION_DETAILS_SETTINGS)
-            intentSettings.data = Uri.fromParts("package", context.packageName, null)
-            context.startActivity(intentSettings)
-        }
+        val intentSettings = Intent(ACTION_APPLICATION_DETAILS_SETTINGS)
+        intentSettings.data = Uri.fromParts("package", context.packageName, null)
+        context.startActivity(intentSettings)
    }

    fun checkFineLocationGranted() {
@@ -308,11 +321,11 @@ fun SettingsScreen(
            },
            onError = { _ ->
                showAuthPrompt = false
-                appViewModel.showSnackbarMessage(Event.Error.AuthenticationFailed.message)
+                appViewModel.showSnackbarMessage(context.getString(R.string.error_authentication_failed))
            },
            onFailure = {
                showAuthPrompt = false
-                appViewModel.showSnackbarMessage(Event.Error.AuthorizationFailed.message)
+                appViewModel.showSnackbarMessage(context.getString(R.string.error_authorization_failed))
            },
        )
    }
@@ -520,12 +533,12 @@ fun SettingsScreen(
                                    when (false) {
                                        isBackgroundLocationGranted ->
                                            appViewModel.showSnackbarMessage(
-                                                Event.Error.BackgroundLocationRequired.message,
+                                                context.getString(R.string.background_location_required),
                                            )

                                        fineLocationState.status.isGranted ->
                                            appViewModel.showSnackbarMessage(
-                                                Event.Error.PreciseLocationRequired.message,
+                                                context.getString(R.string.precise_location_required),
                                            )

                                        viewModel.isLocationEnabled(context) ->
@@ -581,7 +594,7 @@ fun SettingsScreen(
                            viewModel.onToggleAmnezia()
                        },
                    )
-                    if (WgQuickBackend.hasKernelSupport()) {
+                    if (kernelSupport) {
                        ConfigurationToggle(
                            stringResource(R.string.use_kernel),
                            enabled =
@@ -591,10 +604,9 @@ fun SettingsScreen(
                            checked = uiState.settings.isKernelEnabled,
                            padding = screenPadding,
                            onCheckChanged = {
-                                viewModel.onToggleKernelMode().let {
-                                    when (it) {
-                                        is Result.Error -> appViewModel.showSnackbarMessage(it.error.message)
-                                        is Result.Success -> {}
+                                scope.launch {
+                                    viewModel.onToggleKernelMode().onFailure {
+                                        appViewModel.showSnackbarMessage(it.getMessage(context))
                                    }
                                }
                            },
@@ -639,15 +651,24 @@ fun SettingsScreen(
                        )
                    }
                    ConfigurationToggle(
-                        stringResource(R.string.enable_app_lock),
+                        stringResource(R.string.restart_at_boot),
                        enabled = true,
-                        checked = pinExists.value,
+                        checked = uiState.settings.isRestoreOnBootEnabled,
                        padding = screenPadding,
                        onCheckChanged = {
-                            if (pinExists.value) {
-                                PinManager.clearPin()
-                                pinExists.value = PinManager.pinExists()
+                            viewModel.onToggleRestartAtBoot()
+                        },
+                    )
+                    ConfigurationToggle(
+                        stringResource(R.string.enable_app_lock),
+                        enabled = true,
+                        checked = uiState.isPinLockEnabled,
+                        padding = screenPadding,
+                        onCheckChanged = {
+                            if (uiState.isPinLockEnabled) {
+                                viewModel.onPinLockDisabled()
                            } else {
+                                viewModel.onPinLockEnabled()
                                navController.navigate(Screen.Lock.route)
                            }
                        },
@@ -9,5 +9,6 @@ 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 isPinLockEnabled: Boolean = false
 )
@@ -1,39 +1,52 @@
 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.backend.WgQuickBackend
 import com.wireguard.android.util.RootShell
 import com.zaneschepke.wireguardautotunnel.WireGuardAutoTunnel
 import com.zaneschepke.wireguardautotunnel.data.domain.Settings
 import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
+import com.zaneschepke.wireguardautotunnel.module.IoDispatcher
 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.Result
+import com.zaneschepke.wireguardautotunnel.util.FileUtils
+import com.zaneschepke.wireguardautotunnel.util.WgTunnelExceptions
 import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.stateIn
+import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import timber.log.Timber
+import xyz.teamgravity.pin_lock_compose.PinManager
+import java.io.File
 import javax.inject.Inject
+import javax.inject.Provider

@HiltViewModel
 class SettingsViewModel
@Inject
 constructor(
-    private val application: Application,
    private val appDataRepository: AppDataRepository,
    private val serviceManager: ServiceManager,
-    private val rootShell: RootShell,
+    private val rootShell: Provider<RootShell>,
+    private val fileUtils: FileUtils,
+    @IoDispatcher private val ioDispatcher: CoroutineDispatcher,
    vpnService: VpnService
 ) : ViewModel() {

+    private val _kernelSupport = MutableStateFlow(false)
+    val kernelSupport = _kernelSupport.asStateFlow()
+
    val uiState =
        combine(
            appDataRepository.settings.getSettingsFlow(),
@@ -45,8 +58,9 @@ constructor(
                settings,
                tunnels,
                tunnelState,
-                generalState.locationDisclosureShown,
-                generalState.batteryOptimizationDisableShown,
+                generalState.isLocationDisclosureShown,
+                generalState.isBatteryOptimizationDisableShown,
+                generalState.isPinLockEnabled,
            )
        }
            .stateIn(
@@ -60,9 +74,9 @@ 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())
        }
    }

@@ -93,15 +107,19 @@ constructor(
        )
    }

-    fun onToggleAutoTunnel() =
+    suspend fun onExportTunnels(files: List<File>): Result<Unit> {
+        return fileUtils.saveFilesToZip(files)
+    }
+
+    fun onToggleAutoTunnel(context: Context) =
        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(
@@ -110,7 +128,7 @@ constructor(
                    isAutoTunnelPaused = isAutoTunnelPaused,
                ),
            )
-            WireGuardAutoTunnel.requestAutoTunnelTileServiceUpdate(application)
+            WireGuardAutoTunnel.requestAutoTunnelTileServiceUpdate()
        }

    fun onToggleAlwaysOnVPN() =
@@ -163,7 +181,7 @@ constructor(
    }

    fun onToggleAmnezia() = viewModelScope.launch {
-        if(uiState.value.settings.isKernelEnabled) {
+        if (uiState.value.settings.isKernelEnabled) {
            saveKernelMode(false)
        }
        saveAmneziaMode(!uiState.value.settings.isAmneziaEnabled)
@@ -172,28 +190,34 @@ constructor(
    private fun saveAmneziaMode(on: Boolean) {
        saveSettings(
            uiState.value.settings.copy(
-                isAmneziaEnabled = on
-            )
+                isAmneziaEnabled = on,
+            ),
        )
    }

-    fun onToggleKernelMode(): Result<Unit> {
-        if (!uiState.value.settings.isKernelEnabled) {
-            try {
-                rootShell.start()
-                Timber.i("Root shell accepted!")
-                saveKernelMode(on = true)
-                saveAmneziaMode(false)
+    suspend fun onToggleKernelMode(): Result<Unit> {
+        return withContext(ioDispatcher) {
+            if (!uiState.value.settings.isKernelEnabled) {
+                try {
+                    rootShell.get().start()
+                    Timber.i("Root shell accepted!")
+                    saveSettings(
+                        uiState.value.settings.copy(
+                            isKernelEnabled = true,
+                            isAmneziaEnabled = false,
+                        ),
+                    )

-            } catch (e: RootShell.RootShellException) {
-                Timber.e(e)
+                } catch (e: RootShell.RootShellException) {
+                    Timber.e(e)
+                    saveKernelMode(on = false)
+                    return@withContext Result.failure(WgTunnelExceptions.RootDenied())
+                }
+            } else {
                saveKernelMode(on = false)
-                return Result.Error(Event.Error.RootDenied)
            }
-        } else {
-            saveKernelMode(on = false)
+            Result.success(Unit)
        }
-        return Result.Success(Unit)
    }

    fun onToggleRestartOnPing() = viewModelScope.launch {
@@ -203,4 +227,31 @@ constructor(
            ),
        )
    }
+
+    fun checkKernelSupport() = viewModelScope.launch {
+        val kernelSupport = withContext(ioDispatcher) {
+            WgQuickBackend.hasKernelSupport()
+        }
+        _kernelSupport.update {
+            kernelSupport
+        }
+    }
+
+    fun onPinLockDisabled() = viewModelScope.launch {
+        PinManager.clearPin()
+        appDataRepository.appState.setPinLockEnabled(false)
+    }
+
+    fun onPinLockEnabled() = viewModelScope.launch {
+        PinManager.initialize(WireGuardAutoTunnel.instance)
+        appDataRepository.appState.setPinLockEnabled(true)
+    }
+
+    fun onToggleRestartAtBoot() = viewModelScope.launch {
+        saveSettings(
+            uiState.value.settings.copy(
+                isRestoreOnBootEnabled = !uiState.value.settings.isRestoreOnBootEnabled
+            )
+        )
+    }
 }
@@ -107,7 +107,12 @@ fun SupportScreen(
                    modifier = Modifier.padding(bottom = 20.dp),
                )
                TextButton(
-                    onClick = { appViewModel.openWebPage(context.resources.getString(R.string.docs_url), context) },
+                    onClick = {
+                        appViewModel.openWebPage(
+                            context.resources.getString(R.string.docs_url),
+                            context,
+                        )
+                    },
                    modifier = Modifier
                        .padding(vertical = 5.dp)
                        .focusRequester(focusRequester),
@@ -129,7 +134,7 @@ fun SupportScreen(
                                        weight = 1.0f,
                                        fill = false,
                                    ),
-                                softWrap = true
+                                softWrap = true,
                            )
                        }
                        Icon(
@@ -143,7 +148,12 @@ fun SupportScreen(
                    color = MaterialTheme.colorScheme.onBackground,
                )
                TextButton(
-                    onClick = { appViewModel.openWebPage(context.resources.getString(R.string.telegram_url), context) },
+                    onClick = {
+                        appViewModel.openWebPage(
+                            context.resources.getString(R.string.telegram_url),
+                            context,
+                        )
+                    },
                    modifier = Modifier.padding(vertical = 5.dp),
                ) {
                    Row(
@@ -175,7 +185,12 @@ fun SupportScreen(
                    color = MaterialTheme.colorScheme.onBackground,
                )
                TextButton(
-                    onClick = { appViewModel.openWebPage(context.resources.getString(R.string.github_url), context) },
+                    onClick = {
+                        appViewModel.openWebPage(
+                            context.resources.getString(R.string.github_url),
+                            context,
+                        )
+                    },
                    modifier = Modifier.padding(vertical = 5.dp),
                ) {
                    Row(
@@ -269,7 +284,10 @@ fun SupportScreen(
            fontSize = 16.sp,
            modifier =
            Modifier.clickable {
-                appViewModel.openWebPage(context.resources.getString(R.string.privacy_policy_url), context)
+                appViewModel.openWebPage(
+                    context.resources.getString(R.string.privacy_policy_url),
+                    context,
+                )
            },
        )
        Row(
@@ -285,7 +303,7 @@ fun SupportScreen(
            val mode = buildAnnotatedString {
                append(stringResource(R.string.mode))
                append(": ")
-                when(uiState.settings.isKernelEnabled){
+                when (uiState.settings.isKernelEnabled) {
                    true -> append(stringResource(id = R.string.kernel))
                    false -> append(stringResource(id = R.string.userspace))
                }
@@ -1,6 +1,7 @@
 package com.zaneschepke.wireguardautotunnel.ui.screens.support.logs

 import android.annotation.SuppressLint
+import android.widget.Toast
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.Arrangement
@@ -8,7 +9,7 @@ import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.lazy.itemsIndexed
 import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.icons.Icons
@@ -32,17 +33,17 @@ import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import com.zaneschepke.wireguardautotunnel.ui.AppViewModel
+import androidx.hilt.navigation.compose.hiltViewModel
+import com.zaneschepke.logcatter.model.LogMessage
+import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.ui.common.text.LogTypeLabel
 import kotlinx.coroutines.launch

@SuppressLint("UnusedMaterial3ScaffoldPaddingParameter")
@Composable
-fun LogsScreen(appViewModel: AppViewModel) {
+fun LogsScreen(viewModel: LogsViewModel = hiltViewModel()) {

-    val logs = remember {
-        appViewModel.logs
-    }
+    val logs = viewModel.logs

    val context = LocalContext.current

@@ -60,7 +61,15 @@ fun LogsScreen(appViewModel: AppViewModel) {
        floatingActionButton = {
            FloatingActionButton(
                onClick = {
-                    appViewModel.saveLogsToFile(context)
+                    scope.launch {
+                        viewModel.saveLogsToFile().onSuccess {
+                            Toast.makeText(
+                                context,
+                                context.getString(R.string.logs_saved),
+                                Toast.LENGTH_SHORT,
+                            ).show()
+                        }
+                    }
                },
                shape = RoundedCornerShape(16.dp),
                containerColor = MaterialTheme.colorScheme.primary,
@@ -82,7 +91,11 @@ fun LogsScreen(appViewModel: AppViewModel) {
                .fillMaxSize()
                .padding(horizontal = 24.dp),
        ) {
-            items(logs) {
+            itemsIndexed(
+                logs,
+                key = { index, _ -> index },
+                contentType = { _: Int, _: LogMessage -> null },
+            ) { _, it ->
                Row(
                    horizontalArrangement = Arrangement.spacedBy(5.dp, Alignment.Start),
                    verticalAlignment = Alignment.Top,
@@ -0,0 +1,55 @@
+package com.zaneschepke.wireguardautotunnel.ui.screens.support.logs
+
+import androidx.compose.runtime.mutableStateListOf
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.zaneschepke.logcatter.LocalLogCollector
+import com.zaneschepke.logcatter.model.LogMessage
+import com.zaneschepke.wireguardautotunnel.module.IoDispatcher
+import com.zaneschepke.wireguardautotunnel.module.MainDispatcher
+import com.zaneschepke.wireguardautotunnel.util.Constants
+import com.zaneschepke.wireguardautotunnel.util.FileUtils
+import com.zaneschepke.wireguardautotunnel.util.chunked
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import java.time.Duration
+import java.time.Instant
+import javax.inject.Inject
+
+@HiltViewModel
+class LogsViewModel
+@Inject constructor(
+    private val localLogCollector: LocalLogCollector,
+    private val fileUtils: FileUtils,
+    @IoDispatcher private val ioDispatcher: CoroutineDispatcher,
+    @MainDispatcher private val mainDispatcher: CoroutineDispatcher
+) : ViewModel() {
+
+    val logs = mutableStateListOf<LogMessage>()
+
+    init {
+        viewModelScope.launch(ioDispatcher) {
+            localLogCollector.bufferedLogs.chunked(500, Duration.ofSeconds(1)).collect {
+                withContext(mainDispatcher) {
+                    logs.addAll(it)
+                }
+                if (logs.size > Constants.LOG_BUFFER_SIZE) {
+                    withContext(mainDispatcher) {
+                        logs.removeRange(0, (logs.size - Constants.LOG_BUFFER_SIZE).toInt())
+                    }
+                }
+            }
+        }
+    }
+
+    suspend fun saveLogsToFile(): Result<Unit> {
+        val file = localLogCollector.getLogFile().getOrElse {
+            return Result.failure(it)
+        }
+        val fileContent = fileUtils.readBytesFromFile(file)
+        val fileName = "${Constants.BASE_LOG_FILE_NAME}-${Instant.now().epochSecond}.txt"
+        return fileUtils.saveByteArrayToDownloads(fileContent, fileName)
+    }
+}
@@ -16,16 +16,17 @@ object Constants {
    const val URI_CONTENT_SCHEME = "content"
    const val ALLOWED_FILE_TYPES = "*/*"
    const val TEXT_MIME_TYPE = "text/plain"
+    const val ZIP_FILE_MIME_TYPE = "application/zip"
    const val GOOGLE_TV_EXPLORER_STUB = "com.google.android.tv.frameworkpackagestubs"
    const val ANDROID_TV_EXPLORER_STUB = "com.android.tv.frameworkpackagestubs"
    const val ALWAYS_ON_VPN_ACTION = "android.net.VpnService"
-    const val EMAIL_MIME_TYPE = "message/rfc822"
+    const val EMAIL_MIME_TYPE = "plain/text"
    const val SYSTEM_EXEMPT_SERVICE_TYPE_ID = 1024

    const val SUBSCRIPTION_TIMEOUT = 5_000L
    const val FOCUS_REQUEST_DELAY = 500L

-    const val BACKUP_PING_HOST = "1.1.1.1"
+    const val DEFAULT_PING_IP = "1.1.1.1"
    const val PING_TIMEOUT = 5_000L
    const val VPN_RESTART_DELAY = 1_000L
    const val PING_INTERVAL = 60_000L
@@ -37,4 +38,7 @@ object Constants {

    const val UNREADABLE_SSID = "<unknown ssid>"

+    val amneziaProperties = listOf("Jc", "Jmin", "Jmax", "S1", "S2", "H1", "H2", "H3", "H4")
+    const val QR_CODE_NAME_PROPERTY = "# Name ="
+
 }
@@ -1,117 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.util
-
-import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.WireGuardAutoTunnel
-
-sealed class Event {
-
-    abstract val message: String
-
-    sealed class Error : Event() {
-        data object None : Error() {
-            override val message: String
-                get() = WireGuardAutoTunnel.instance.getString(R.string.error_none)
-        }
-
-        data object SsidConflict : Error() {
-            override val message: String
-                get() = WireGuardAutoTunnel.instance.getString(R.string.error_ssid_exists)
-        }
-
-        data class ConfigParseError(val appendedMessage: String) : Error() {
-            override val message: String =
-                WireGuardAutoTunnel.instance.getString(R.string.config_parse_error) + (
-                    if (appendedMessage != "") ": ${appendedMessage.trim()}" else "")
-        }
-
-        data object RootDenied : Error() {
-            override val message: String
-                get() = WireGuardAutoTunnel.instance.getString(R.string.error_root_denied)
-        }
-
-        data class General(val customMessage: String) : Error() {
-            override val message: String
-                get() = customMessage
-        }
-
-        data class Exception(val exception: kotlin.Exception) : Error() {
-            override val message: String
-                get() =
-                    exception.message
-                        ?: WireGuardAutoTunnel.instance.getString(R.string.unknown_error)
-        }
-
-        data object InvalidQrCode : Error() {
-            override val message: String
-                get() = WireGuardAutoTunnel.instance.getString(R.string.error_invalid_code)
-        }
-
-        data object InvalidFileExtension : Error() {
-            override val message: String
-                get() = WireGuardAutoTunnel.instance.getString(R.string.error_file_extension)
-        }
-
-        data object FileReadFailed : Error() {
-            override val message: String
-                get() = WireGuardAutoTunnel.instance.getString(R.string.error_file_extension)
-        }
-
-        data object AuthenticationFailed : Error() {
-            override val message: String
-                get() = WireGuardAutoTunnel.instance.getString(R.string.error_authentication_failed)
-        }
-
-        data object AuthorizationFailed : Error() {
-            override val message: String
-                get() = WireGuardAutoTunnel.instance.getString(R.string.error_authorization_failed)
-        }
-
-        data object BackgroundLocationRequired : Error() {
-            override val message: String
-                get() =
-                    WireGuardAutoTunnel.instance.getString(R.string.background_location_required)
-        }
-
-        data object LocationServicesRequired : Error() {
-            override val message: String
-                get() = WireGuardAutoTunnel.instance.getString(R.string.location_services_required)
-        }
-
-        data object PreciseLocationRequired : Error() {
-            override val message: String
-                get() = WireGuardAutoTunnel.instance.getString(R.string.precise_location_required)
-        }
-
-        data object FileExplorerRequired : Error() {
-            override val message: String
-                get() = WireGuardAutoTunnel.instance.getString(R.string.error_no_file_explorer)
-        }
-    }
-
-    sealed class Message : Event() {
-        data object ConfigSaved : Message() {
-            override val message: String
-                get() = WireGuardAutoTunnel.instance.getString(R.string.config_changes_saved)
-        }
-
-        data object ConfigsExported : Message() {
-            override val message: String
-                get() = WireGuardAutoTunnel.instance.getString(R.string.exported_configs_message)
-        }
-
-        data object TunnelOffAction : Message() {
-            override val message: String
-                get() = WireGuardAutoTunnel.instance.getString(R.string.turn_off_tunnel)
-        }
-
-        data object TunnelOnAction : Message() {
-            override val message: String
-                get() = WireGuardAutoTunnel.instance.getString(R.string.turn_on_tunnel)
-        }
-
-        data object AutoTunnelOffAction : Message() {
-            override val message: String
-                get() = WireGuardAutoTunnel.instance.getString(R.string.turn_off_auto)
-        }
-    }
-}
@@ -1,39 +1,30 @@
 package com.zaneschepke.wireguardautotunnel.util

-import android.content.BroadcastReceiver
+import android.content.Context
 import android.content.pm.PackageInfo
+import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
 import com.zaneschepke.wireguardautotunnel.service.tunnel.HandshakeStatus
 import com.zaneschepke.wireguardautotunnel.service.tunnel.statistics.TunnelStatistics
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.DelicateCoroutinesApi
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.launch
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.ObsoleteCoroutinesApi
+import kotlinx.coroutines.channels.ClosedReceiveChannelException
+import kotlinx.coroutines.channels.ReceiveChannel
+import kotlinx.coroutines.channels.produce
+import kotlinx.coroutines.channels.ticker
+import kotlinx.coroutines.coroutineScope
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.channelFlow
+import kotlinx.coroutines.selects.whileSelect
+import org.amnezia.awg.config.Config
+import timber.log.Timber
 import java.math.BigDecimal
 import java.text.DecimalFormat
-import kotlin.coroutines.CoroutineContext
-import kotlin.coroutines.EmptyCoroutineContext
-
-fun BroadcastReceiver.goAsync(
-    context: CoroutineContext = EmptyCoroutineContext,
-    block: suspend CoroutineScope.() -> Unit
-) {
-    val pendingResult = goAsync()
-    @OptIn(DelicateCoroutinesApi::class) // Must run globally; there's no teardown callback.
-    GlobalScope.launch(context) {
-        try {
-            block()
-        } finally {
-            pendingResult.finish()
-        }
-    }
-}
-
-fun String.truncateWithEllipsis(allowedLength: Int): String {
-    return if (this.length > allowedLength + 3) {
-        this.substring(0, allowedLength) + "***"
-    } else this
-}
+import java.time.Duration
+import java.util.concurrent.ConcurrentLinkedQueue
+import kotlin.coroutines.cancellation.CancellationException

 fun BigDecimal.toThreeDecimalPlaceString(): String {
    val df = DecimalFormat("#.###")
@@ -69,3 +60,89 @@ fun TunnelStatistics.PeerStats.handshakeStatus(): HandshakeStatus {
        }
    }
 }
+
+fun Config.toWgQuickString(): String {
+    val amQuick = toAwgQuickString()
+    val lines = amQuick.lines().toMutableList()
+    val linesIterator = lines.iterator()
+    while (linesIterator.hasNext()) {
+        val next = linesIterator.next()
+        Constants.amneziaProperties.forEach {
+            if (next.startsWith(it, ignoreCase = true)) {
+                linesIterator.remove()
+            }
+        }
+    }
+    return lines.joinToString(System.lineSeparator())
+}
+
+fun Throwable.getMessage(context: Context): String {
+    return when (this) {
+        is WgTunnelExceptions -> this.getMessage(context)
+        else -> this.message ?: StringValue.StringResource(R.string.unknown_error).asString(context)
+    }
+}
+
+/**
+ * Chunks based on a time or size threshold.
+ *
+ * Borrowed from this [Stack Overflow question](https://stackoverflow.com/questions/51022533/kotlin-chunk-sequence-based-on-size-and-time).
+ */
+@OptIn(ObsoleteCoroutinesApi::class, ExperimentalCoroutinesApi::class)
+fun <T> ReceiveChannel<T>.chunked(scope: CoroutineScope, size: Int, time: Duration) =
+    scope.produce<List<T>> {
+        while (true) { // this loop goes over each chunk
+            val chunk = ConcurrentLinkedQueue<T>() // current chunk
+            val ticker = ticker(time.toMillis()) // time-limit for this chunk
+            try {
+                whileSelect {
+                    ticker.onReceive {
+                        false // done with chunk when timer ticks, takes priority over received elements
+                    }
+                    this@chunked.onReceive {
+                        chunk += it
+                        chunk.size < size // continue whileSelect if chunk is not full
+                    }
+                }
+            } catch (e: ClosedReceiveChannelException) {
+                Timber.e(e)
+                return@produce
+            } finally {
+                ticker.cancel()
+                if (chunk.isNotEmpty()) {
+                    send(chunk.toList())
+                }
+            }
+        }
+    }
+
+@OptIn(DelicateCoroutinesApi::class, ExperimentalCoroutinesApi::class)
+fun <T> Flow<T>.chunked(size: Int, time: Duration) = channelFlow {
+    coroutineScope {
+        val channel = asChannel(this@chunked).chunked(this, size, time)
+        try {
+            while (!channel.isClosedForReceive) {
+                send(channel.receive())
+            }
+        } catch (e: ClosedReceiveChannelException) {
+            // Channel was closed by the flow completing, nothing to do
+            Timber.w(e)
+        } catch (e: CancellationException) {
+            channel.cancel(e)
+            throw e
+        } catch (e: Exception) {
+            channel.cancel(CancellationException("Closing channel due to flow exception", e))
+            throw e
+        }
+    }
+}
+
+@ExperimentalCoroutinesApi
+fun <T> CoroutineScope.asChannel(flow: Flow<T>): ReceiveChannel<T> = produce {
+    flow.collect { value ->
+        channel.send(value)
+    }
+}
+
+
+
@@ -6,19 +6,102 @@ import android.os.Build
 import android.os.Environment
 import android.provider.MediaStore
 import android.provider.MediaStore.MediaColumns
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.withContext
+import timber.log.Timber
 import java.io.File
+import java.io.FileInputStream
 import java.io.FileOutputStream
 import java.io.OutputStream
 import java.time.Instant
 import java.util.zip.ZipEntry
 import java.util.zip.ZipOutputStream

-object FileUtils {
-    private const val ZIP_FILE_MIME_TYPE = "application/zip"
+class FileUtils(
+    private val context: Context,
+    private val ioDispatcher: CoroutineDispatcher,
+) {
+
+    suspend fun readBytesFromFile(file: File): ByteArray {
+        return withContext(ioDispatcher) {
+            FileInputStream(file).use {
+                it.readBytes()
+            }
+        }
+    }
+
+    suspend fun readTextFromFileName(fileName: String): String {
+        return withContext(ioDispatcher) {
+            context.assets.open(fileName).use { stream ->
+                stream.bufferedReader(Charsets.UTF_8).use {
+                    it.readText()
+                }
+            }
+        }
+    }
+
+    suspend fun saveByteArrayToDownloads(content: ByteArray, fileName: String): Result<Unit> {
+        return withContext(ioDispatcher) {
+            try {
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+                    val contentValues =
+                        ContentValues().apply {
+                            put(MediaColumns.DISPLAY_NAME, fileName)
+                            put(MediaColumns.MIME_TYPE, Constants.TEXT_MIME_TYPE)
+                            put(MediaColumns.RELATIVE_PATH, Environment.DIRECTORY_DOWNLOADS)
+                        }
+                    val resolver = context.contentResolver
+                    val uri =
+                        resolver.insert(MediaStore.Downloads.EXTERNAL_CONTENT_URI, contentValues)
+                    if (uri != null) {
+                        resolver.openOutputStream(uri).use { output ->
+                            output?.write(content)
+                        }
+                    }
+                } else {
+                    val target =
+                        File(
+                            Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS),
+                            fileName,
+                        )
+                    FileOutputStream(target).use { output ->
+                        output.write(content)
+                    }
+                }
+                Result.success(Unit)
+            } catch (e: Exception) {
+                Result.failure(e)
+            }
+        }
+    }
+
+    suspend fun saveFilesToZip(files: List<File>): Result<Unit> {
+        return withContext(ioDispatcher) {
+            try {
+                val zipOutputStream =
+                    createDownloadsFileOutputStream(
+                        "wg-export_${Instant.now().epochSecond}.zip",
+                        Constants.ZIP_FILE_MIME_TYPE,
+                    )
+                ZipOutputStream(zipOutputStream).use { zos ->
+                    files.forEach { file ->
+                        val entry = ZipEntry(file.name)
+                        zos.putNextEntry(entry)
+                        if (file.isFile) {
+                            file.inputStream().use { fis -> fis.copyTo(zos) }
+                        }
+                    }
+                    return@withContext Result.success(Unit)
+                }
+            } catch (e: Exception) {
+                Timber.e(e)
+                Result.failure(WgTunnelExceptions.ConfigExportFailed())
+            }
+        }
+    }

    //TODO issue with android 9
    private fun createDownloadsFileOutputStream(
-        context: Context,
        fileName: String,
        mimeType: String = Constants.ALLOWED_FILE_TYPES
    ): OutputStream? {
@@ -44,47 +127,4 @@ object FileUtils {
        }
        return null
    }
-
-    fun saveFileToDownloads(context: Context, content: String, fileName: String) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-            val contentValues = ContentValues().apply {
-                put(MediaColumns.DISPLAY_NAME, fileName)
-                put(MediaColumns.MIME_TYPE, Constants.TEXT_MIME_TYPE)
-                put(MediaColumns.RELATIVE_PATH, Environment.DIRECTORY_DOWNLOADS)
-            }
-            val resolver = context.contentResolver
-            val uri = resolver.insert(MediaStore.Downloads.EXTERNAL_CONTENT_URI, contentValues)
-            if (uri != null) {
-                resolver.openOutputStream(uri).use { output ->
-                    output?.write(content.toByteArray())
-                }
-            }
-        } else {
-            val target = File(
-                Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS),
-                fileName,
-            )
-            FileOutputStream(target).use { output ->
-                output.write(content.toByteArray())
-            }
-        }
-    }
-
-    fun saveFilesToZip(context: Context, files: List<File>) {
-        val zipOutputStream =
-            createDownloadsFileOutputStream(
-                context,
-                "wg-export_${Instant.now().epochSecond}.zip",
-                ZIP_FILE_MIME_TYPE,
-            )
-        ZipOutputStream(zipOutputStream).use { zos ->
-            files.forEach { file ->
-                val entry = ZipEntry(file.name)
-                zos.putNextEntry(entry)
-                if (file.isFile) {
-                    file.inputStream().use { fis -> fis.copyTo(zos) }
-                }
-            }
-        }
-    }
 }
@@ -1,16 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.util
-
-import timber.log.Timber
-
-sealed class Result<T> {
-    class Success<T>(val data: T) : Result<T>()
-
-    class Error<T>(val error: Event.Error) : Result<T>() {
-        init {
-            when (this.error) {
-                is Event.Error.Exception -> Timber.e(this.error.exception)
-                else -> Timber.e(this.error.message)
-            }
-        }
-    }
-}
@@ -0,0 +1,130 @@
+package com.zaneschepke.wireguardautotunnel.util
+
+import android.content.Context
+import com.zaneschepke.wireguardautotunnel.R
+
+sealed class WgTunnelExceptions : Exception() {
+    abstract fun getMessage(context: Context): String
+    data class General(private val userMessage: StringValue) : WgTunnelExceptions() {
+        override fun getMessage(context: Context): String {
+            return userMessage.asString(context)
+        }
+    }
+
+    data class SsidConflict(private val userMessage: StringValue = StringValue.StringResource(R.string.error_ssid_exists)) :
+        WgTunnelExceptions() {
+        override fun getMessage(context: Context): String {
+            return userMessage.asString(context)
+        }
+    }
+
+    data class ConfigExportFailed(
+        private val userMessage: StringValue = StringValue.StringResource(
+            R.string.export_configs_failed,
+        )
+    ) : WgTunnelExceptions() {
+        override fun getMessage(context: Context): String {
+            return userMessage.asString(context)
+        }
+    }
+
+    data class ConfigParseError(private val appendMessage: StringValue = StringValue.Empty) :
+        WgTunnelExceptions() {
+        override fun getMessage(context: Context): String {
+            return StringValue.StringResource(R.string.config_parse_error).asString(context) + (
+                if (appendMessage != StringValue.Empty) ": ${appendMessage.asString(context)}" else "")
+        }
+    }
+
+    data class RootDenied(private val userMessage: StringValue = StringValue.StringResource(R.string.error_root_denied)) :
+        WgTunnelExceptions() {
+        override fun getMessage(context: Context): String {
+            return userMessage.asString(context)
+        }
+    }
+
+    data class InvalidQrCode(private val userMessage: StringValue = StringValue.StringResource(R.string.error_invalid_code)) :
+        WgTunnelExceptions() {
+        override fun getMessage(context: Context): String {
+            return userMessage.asString(context)
+        }
+    }
+
+    data class InvalidFileExtension(
+        private val userMessage: StringValue = StringValue.StringResource(
+            R.string.error_file_extension,
+        )
+    ) : WgTunnelExceptions() {
+        override fun getMessage(context: Context): String {
+            return userMessage.asString(context)
+        }
+    }
+
+    data class FileReadFailed(private val userMessage: StringValue = StringValue.StringResource(R.string.error_file_format)) :
+        WgTunnelExceptions() {
+        override fun getMessage(context: Context): String {
+            return userMessage.asString(context)
+        }
+    }
+
+    data class AuthenticationFailed(
+        private val userMessage: StringValue = StringValue.StringResource(
+            R.string.error_authentication_failed,
+        )
+    ) : WgTunnelExceptions() {
+        override fun getMessage(context: Context): String {
+            return userMessage.asString(context)
+        }
+    }
+
+    data class AuthorizationFailed(
+        private val userMessage: StringValue = StringValue.StringResource(
+            R.string.error_authorization_failed,
+        )
+    ) : WgTunnelExceptions() {
+        override fun getMessage(context: Context): String {
+            return userMessage.asString(context)
+        }
+    }
+
+    data class BackgroundLocationRequired(
+        private val userMessage: StringValue = StringValue.StringResource(
+            R.string.background_location_required,
+        )
+    ) : WgTunnelExceptions() {
+        override fun getMessage(context: Context): String {
+            return userMessage.asString(context)
+        }
+    }
+
+    data class LocationServicesRequired(
+        private val userMessage: StringValue = StringValue.StringResource(
+            R.string.location_services_required,
+        )
+    ) : WgTunnelExceptions() {
+        override fun getMessage(context: Context): String {
+            return userMessage.asString(context)
+        }
+    }
+
+    data class PreciseLocationRequired(
+        private val userMessage: StringValue = StringValue.StringResource(
+            R.string.precise_location_required,
+        )
+    ) : WgTunnelExceptions() {
+        override fun getMessage(context: Context): String {
+            return userMessage.asString(context)
+        }
+    }
+
+    data class FileExplorerRequired(
+        private val userMessage: StringValue = StringValue.StringResource(
+            R.string.error_no_file_explorer,
+        )
+    ) : WgTunnelExceptions() {
+        override fun getMessage(context: Context): String {
+            return userMessage.asString(context)
+        }
+    }
+}
+
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <path
+        android:fillColor="#e8eaed"
+        android:pathData="M440,520L200,520v-80h240v-240h80v240h240v80L520,520v240h-80v-240Z" />
+</vector>
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <path
+        android:fillColor="#e8eaed"
+        android:pathData="m256,760 l-56,-56 224,-224 -224,-224 56,-56 224,224 224,-224 56,56 -224,224 224,224 -56,56 -224,-224 -224,224Z" />
+</vector>
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <path
+        android:fillColor="#e8eaed"
+        android:pathData="M200,760h57l391,-391 -57,-57 -391,391v57ZM120,840v-170l528,-527q12,-11 26.5,-17t30.5,-6q16,0 31,6t26,18l55,56q12,11 17.5,26t5.5,30q0,16 -5.5,30.5T817,313L290,840L120,840ZM760,256 L704,200 760,256ZM619,341 L591,312 648,369 619,341Z" />
+</vector>
@@ -3,7 +3,7 @@
    android:height="50dp"
    android:viewportWidth="50"
    android:viewportHeight="50">
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M25,2c12.703,0 23,10.297 23,23S37.703,48 25,48S2,37.703 2,25S12.297,2 25,2zM32.934,34.375c0.423,-1.298 2.405,-14.234 2.65,-16.783c0.074,-0.772 -0.17,-1.285 -0.648,-1.514c-0.578,-0.278 -1.434,-0.139 -2.427,0.219c-1.362,0.491 -18.774,7.884 -19.78,8.312c-0.954,0.405 -1.856,0.847 -1.856,1.487c0,0.45 0.267,0.703 1.003,0.966c0.766,0.273 2.695,0.858 3.834,1.172c1.097,0.303 2.346,0.04 3.046,-0.395c0.742,-0.461 9.305,-6.191 9.92,-6.693c0.614,-0.502 1.104,0.141 0.602,0.644c-0.502,0.502 -6.38,6.207 -7.155,6.997c-0.941,0.959 -0.273,1.953 0.358,2.351c0.721,0.454 5.906,3.932 6.687,4.49c0.781,0.558 1.573,0.811 2.298,0.811C32.191,36.439 32.573,35.484 32.934,34.375z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M25,2c12.703,0 23,10.297 23,23S37.703,48 25,48S2,37.703 2,25S12.297,2 25,2zM32.934,34.375c0.423,-1.298 2.405,-14.234 2.65,-16.783c0.074,-0.772 -0.17,-1.285 -0.648,-1.514c-0.578,-0.278 -1.434,-0.139 -2.427,0.219c-1.362,0.491 -18.774,7.884 -19.78,8.312c-0.954,0.405 -1.856,0.847 -1.856,1.487c0,0.45 0.267,0.703 1.003,0.966c0.766,0.273 2.695,0.858 3.834,1.172c1.097,0.303 2.346,0.04 3.046,-0.395c0.742,-0.461 9.305,-6.191 9.92,-6.693c0.614,-0.502 1.104,0.141 0.602,0.644c-0.502,0.502 -6.38,6.207 -7.155,6.997c-0.941,0.959 -0.273,1.953 0.358,2.351c0.721,0.454 5.906,3.932 6.687,4.49c0.781,0.558 1.573,0.811 2.298,0.811C32.191,36.439 32.573,35.484 32.934,34.375z" />
 </vector>
@@ -0,0 +1,154 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="no_tunnels">Žádné tunely ještě nebyly přidány!</string>
+    <string name="watcher_notification_text_paused">Monitorování změn ve stavu sítě: pozastaveno</string>
+    <string name="notification_permission_required">Je vyžadováno oprávnění pro oznámení.</string>
+    <string name="add_trusted_ssid">Přidat název důvěryhodné Wi-Fi</string>
+    <string name="enable_auto_tunnel">Spustit automatické tunelování</string>
+    <string name="tunnel_mobile_data">Tunelování na mobilních datech</string>
+    <string name="one_tunnel_required">Alespoň jeden tunel je vyžadován pro použití této funkce</string>
+    <string name="privacy_policy">Otevřít zásady soukromí</string>
+    <string name="okay">OK</string>
+    <string name="thank_you">Děkujeme za používání WG Tunnel!</string>
+    <string name="add_tunnels_text">Přidat ze souboru nebo zipu</string>
+    <string name="open_file">Otevřít soubor</string>
+    <string name="add_from_qr">Přidat z QR kódu</string>
+    <string name="qr_scan">QR skenování</string>
+    <string name="tunnel_name">Název tunelu</string>
+    <string name="add_tunnel">Přidat tunel</string>
+    <string name="exclude">Vyloučit</string>
+    <string name="include">Zahrnout</string>
+    <string name="save_changes">Uložit</string>
+    <string name="endpoint">Koncový bod</string>
+    <string name="vpn_connection_failed">Připojení selhalo</string>
+    <string name="always_on_vpn_support">Povolit trvalé připojení VPN</string>
+    <string name="location_services_not_detected">Služby polohy nebyly detekovány</string>
+    <string name="hint_search_packages">Hledat balíčky</string>
+    <string name="attempt_connection">Pokus o připojení...</string>
+    <string name="vpn_starting">VPN se spouští</string>
+    <string name="vpn_on">VPN zapnuto</string>
+    <string name="vpn_off">VPN vypnuto</string>
+    <string name="default_vpn_on">Hlavní VPN zapnuto</string>
+    <string name="default_vpn_off">Hlavní VPN vypnuto</string>
+    <string name="create_import">Vytvořit od základu</string>
+    <string name="turn_off_auto">Akce vyžaduje, aby bylo automatické tunelování vypnuté či pozastavené</string>
+    <string name="add_peer">Přidat peer</string>
+    <string name="comma_separated_list">seznam oddělený čárkami</string>
+    <string name="random">(náhodné)</string>
+    <string name="optional">(volitelné)</string>
+    <string name="optional_no_recommend">(volitelné, nedoporučeno)</string>
+    <string name="preshared_key">Předsdílený klíč</string>
+    <string name="seconds">vteřin(y)</string>
+    <string name="cancel">Zrušit</string>
+    <string name="error_authentication_failed">Autentizace selhala</string>
+    <string name="error_authorization_failed">Nepovedlo se autorizovat</string>
+    <string name="enabled_app_shortcuts">Zapnout zkratky</string>
+    <string name="export_configs">Exportovat konfigurace</string>
+    <string name="export_configs_failed">Nepovedlo se exportovat konfigurace</string>
+    <string name="location_services_required">Služby polohy vyžadovány</string>
+    <string name="background_location_required">Oprávnění pro polohu na pozadí vyžadováno</string>
+    <string name="precise_location_required">Oprávnění pro přesnou polohu vyžadováno</string>
+    <string name="unknown_error">Došlo k neznámé chybě</string>
+    <string name="exported_configs_message">Konfigurace exportovány do stažených souborů</string>
+    <string name="tunnel_on_wifi">Tunelovat na nedůvěryhodné Wi-Fi</string>
+    <string name="email_subject">WG Tunnel podpora</string>
+    <string name="email_chooser">Poslat email…</string>
+    <string name="use_kernel">Použít kernel modul</string>
+    <string name="error_ssid_exists">SSID již existuje</string>
+    <string name="error_root_denied">Oprávnění root zamítnuto</string>
+    <string name="error_no_file_explorer">Žádný průzkumník souborů není nainstalován</string>
+    <string name="error_invalid_code">Neplatný QR kód</string>
+    <string name="error_none">Žádná chyba</string>
+    <string name="auto_tunnel_title">Služba automatického tunelování</string>
+    <string name="resume">Obnovit</string>
+    <string name="active">aktivní</string>
+    <string name="open_issue">Otevřít případ</string>
+    <string name="incorrect_pin">PIN je nesprávný</string>
+    <string name="create_pin">Vytvořte PIN</string>
+    <string name="set_primary_tunnel">Nastavit jako hlavní tunel</string>
+    <string name="use_tunnel_on_wifi_name">Použít tunel pro Wi-Fi</string>
+    <string name="edit_tunnel">Upravit tunel</string>
+    <string name="disabled">vypnuto</string>
+    <string name="auto_tun_on">Obnovit automatické tunelování</string>
+    <string name="auto_tun_off">Pozastavit automatické tunelování</string>
+    <string name="version">Verze</string>
+    <string name="mode">Mód</string>
+    <string name="use_amnezia">"Použít Amnezia userspace "</string>
+    <string name="junk_packet_count">Junk packet počet</string>
+    <string name="junk_packet_minimum_size">Junk packet minimální velikost</string>
+    <string name="junk_packet_maximum_size">Junk packet maximální velikost</string>
+    <string name="init_packet_junk_size">Init packet junk velikost</string>
+    <string name="response_packet_junk_size">Response packet junk velikost</string>
+    <string name="unsure_how">pokud si nejste jisti, jak postupovat</string>
+    <string name="see_the">Podívejte se na</string>
+    <string name="getting_started_guide">začátečnickou příručku</string>
+    <string name="error_file_format">Neplatný formát konfigurace</string>
+    <string name="error_file_extension">Soubor není ve formátu .conf nebo .zip</string>
+    <string name="turn_off_tunnel">Akce vyžaduje vypnutí tunelu</string>
+    <string name="watcher_notification_text_active">Monitorování změn ve stavu sítě: aktivní</string>
+    <string name="tunnel_on_ethernet">Tunelovat na ethernetu</string>
+    <string name="tunnel_start_title">VPN připojeno</string>
+    <string name="prominent_background_location_message">Tato funkce vyžaduje oprávnění pro přístup k poloze na pozadí pro zapnutí monitorování Wi-Fi SSID, i když je aplikace zavřená. Pro více detailů, podívejte se prosím na zásady soukromí umístěné v kategorii Podpora.</string>
+    <string name="tunnel_start_text">Připojeno k tunelu</string>
+    <string name="tunnels">Tunely</string>
+    <string name="disable_auto_tunnel">Zastavit automatické tunelování</string>
+    <string name="tunnel_all">Tunelovat všechny aplikace</string>
+    <string name="config_changes_saved">Změny v konfiguraci uloženy.</string>
+    <string name="icon">Ikona</string>
+    <string name="no_thanks">Ne, děkuji</string>
+    <string name="turn_on">Zapnout</string>
+    <string name="map">Mapa</string>
+    <string name="public_key">Veřejný klíč</string>
+    <string name="addresses">Adresy</string>
+    <string name="dns_servers">DNS servery</string>
+    <string name="allowed_ips">Povolené IP adresy</string>
+    <string name="name">Název</string>
+    <string name="restart">Restartovat tunel</string>
+    <string name="scanning_qr">Skenování QR</string>
+    <string name="none">Žádné názvy důvěryhodných Wi-Fi</string>
+    <string name="other">Ostatní</string>
+    <string name="auto_tunneling">Automatické tunelování</string>
+    <string name="turn_on_tunnel">Akce vyžaduje aktivní tunel</string>
+    <string name="interface_">Rozhraní</string>
+    <string name="done">Hotovo</string>
+    <string name="rotate_keys">Rotovat klíče</string>
+    <string name="private_key">Soukromý klíč</string>
+    <string name="copy_public_key">Kopírovat veřejný klíč</string>
+    <string name="base64_key">base64 klíč</string>
+    <string name="docs_description">Přečíst si dokumentaci</string>
+    <string name="discord_description">Přidat se ke komunitě</string>
+    <string name="email_description">Poslat mi email</string>
+    <string name="support_help_text">Pokud máte potíže, nápady pro zlepšení, nebo se chcete jen zapojit, následující prostředky jsou k dispozici:</string>
+    <string name="location_services_missing_message">Aplikace nenašla žádné služby polohy zapnuté na Vašem zařízení. Dle Vašeho zařízení, tohle může způsobit, že funkce nedůvěryhodné Wi-Fi nedokáže přečíst jméno připojené Wi-Fi. Chcete i přesto pokračovat?</string>
+    <string name="delete_tunnel">Smazat tunel</string>
+    <string name="delete_tunnel_message">Jste si jisti, že chcete smazat tento tunel?</string>
+    <string name="yes">Ano</string>
+    <string name="pause">Pozastavit</string>
+    <string name="paused">pozastaveno</string>
+    <string name="tunneling_apps">Tunelování aplikací</string>
+    <string name="all">vše</string>
+    <string name="included">zahrnuto</string>
+    <string name="excluded">vyloučeno</string>
+    <string name="always_on_disabled">Trvalé VPN připojení se pokusilo spustit tunel, ale tato funkce je vypnutá v nastavení.</string>
+    <string name="no_email_detected">Žádná emailová aplikace nebyla nalezena</string>
+    <string name="no_browser_detected">Žádný prohlížeč nebyl nalezen</string>
+    <string name="logs_saved">Logy uloženy do stažených souborů</string>
+    <string name="read_logs">Přečíst si logy</string>
+    <string name="config_parse_error">Nepovedlo se vložit konfiguraci</string>
+    <string name="pin_created">PIN úspěšně vytvořen</string>
+    <string name="enter_pin">Vložte Váš PIN</string>
+    <string name="no_wifi_names_configured">Žádné názvy Wi-Fi nebyly nastaveny pro tento tunel</string>
+    <string name="enable_app_lock">Zapnout zámek aplikace</string>
+    <string name="restart_on_ping">Restartovat při selhání pingu</string>
+    <string name="mobile_data_tunnel">Nastavit jako tunel pro mobilní data</string>
+    <string name="general">Obecné</string>
+    <string name="settings">Nastavení</string>
+    <string name="support">Podpora</string>
+    <string name="app_name">WG Tunnel</string>
+    <string name="mtu">MTU</string>
+    <string name="db_name">wg-tunnel-db</string>
+    <string name="listen_port">Naslouchací port</string>
+    <string name="auto">(automaticky)</string>
+    <string name="kernel">Kernel</string>
+    <string name="backend">Backend</string>
+</resources>
@@ -1,42 +1,41 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <string name="app_name">WG Tunnel</string>
-    <string name="error_file_extension">Dies ist keine .conf oder .zip Datei</string>
+    <string name="error_file_extension">Datei ist keine .conf oder .zip</string>
    <string name="no_tunnels">Noch keine Tunnel hinzugefügt!</string>
    <string name="watcher_notification_text_active">Überwachung der Netzwerkänderungen: aktiv</string>
    <string name="tunnels">Tunnel</string>
-    <string name="enable_auto_tunnel">Starte automatisches Verbinden</string>
-    <string name="tunnel_mobile_data">Verbinden im Mobilnetzwerk</string>
-    <string name="one_tunnel_required">Mindestens eine Verbindung wird für diese Funktion benötigt</string>
-    <string name="privacy_policy">Siehe Privacy Policy</string>
-    <string name="disable_auto_tunnel">Stoppe automatisches Verbinden</string>
-    <string name="okay">Okay</string>
-    <string name="tunnel_on_ethernet">Verbindung über Ethernet</string>
-    <string name="search_icon">Suchsymbol</string>
-    <string name="attempt_connection">Versuche zu verbinden..</string>
-    <string name="auto_tunneling">Automatisches verbinden</string>
+    <string name="enable_auto_tunnel">Auto-Tunneln starten</string>
+    <string name="tunnel_mobile_data">Tunnel für mobile Daten</string>
+    <string name="one_tunnel_required">Mindestens ein Tunnel wird für diese Funktion benötigt</string>
+    <string name="privacy_policy">Datenschutzbestimmungen anzeigen</string>
+    <string name="disable_auto_tunnel">Auto-Tunneln stoppen</string>
+    <string name="okay">Ok</string>
+    <string name="tunnel_on_ethernet">Tunnel für Ethernet</string>
+    <string name="attempt_connection">Verbindungsversuch..</string>
+    <string name="auto_tunneling">Auto-Tunneln</string>
    <string name="default_vpn_off">Primärer VPN aus</string>
-    <string name="turn_on_tunnel">Für diese Altion muss eine Verbindung bestehen</string>
+    <string name="turn_on_tunnel">Für diese Aktion muss ein aktiver Tunnel bestehen</string>
    <string name="watcher_notification_text_paused">Überwachung der Netzwerkänderungen: pausiert</string>
    <string name="tunnel_start_title">VPN verbunden</string>
    <string name="tunnel_start_text">Mit Tunnel verbunden</string>
-    <string name="notification_permission_required">Berechtigung für die Benachrichtigung benötigt.</string>
-    <string name="add_trusted_ssid">Vertrauenswürdiger WiFi-Name hinzugügen</string>
-    <string name="prominent_background_location_message">Diese Funktion benötigt Standortberechtigung im Hintergrund um die WiFi SSIDs auch wenn die Applikation geschlossen ist zu überwachen. Für mehr Infos, siehe Privacy Policy auf der Hilfeseite.</string>
+    <string name="notification_permission_required">Benachrichtigungsberechtigung benötigt.</string>
+    <string name="add_trusted_ssid">Vertrauenswürdigen WLAN-Namen hinzufügen</string>
+    <string name="prominent_background_location_message">Diese Funktion erfordert die Erlaubnis zur Standortbestimmung im Hintergrund, um die Überwachung der WLAN SSID zu ermöglichen, auch wenn die Anwendung geschlossen ist. Weitere Einzelheiten in den Datenschutzbestimmungen, die auf dem Support-Bildschirm verlinkt sind.</string>
    <string name="prominent_background_location_title">Vereinbarung der Standortberechtigung im Hintergrund</string>
-    <string name="thank_you">Danke fürs benutzen von WG Tunnel!</string>
+    <string name="thank_you">Danke fürs Benutzen von WG Tunnel!</string>
    <string name="trusted_ssid_empty_description">SSID eingeben</string>
    <string name="trusted_ssid_value_description">SSID bestätigen</string>
    <string name="add_tunnels_text">Von Datei oder ZIP hinzufügen</string>
-    <string name="open_file">Datei geöffnet</string>
-    <string name="add_from_qr">Von QR-Code hinzufügen</string>
+    <string name="open_file">Datei öffnen</string>
+    <string name="add_from_qr">Über QR-Code hinzufügen</string>
    <string name="qr_scan">Scanne QR</string>
-    <string name="tunnel_name">Verbindungsname</string>
-    <string name="add_tunnel">Verbindung hinzufügen</string>
-    <string name="exclude">Ausgenommen</string>
-    <string name="include">Eingeschlossen</string>
-    <string name="tunnel_all">Verbinde alle Apps</string>
-    <string name="config_changes_saved">Änderungen der Konfiguration gespeichert.</string>
+    <string name="tunnel_name">Tunnel Name</string>
+    <string name="add_tunnel">Tunnel hinzufügen</string>
+    <string name="exclude">Ausschließen</string>
+    <string name="include">Einschließen</string>
+    <string name="tunnel_all">Alle Apps tunneln</string>
+    <string name="config_changes_saved">Konfigurationsänderungen gespeichert.</string>
    <string name="save_changes">Speichern</string>
    <string name="icon">Symbol</string>
    <string name="no_thanks">Nein danke</string>
@@ -50,52 +49,51 @@
    <string name="allowed_ips">Erlaubte IPs</string>
    <string name="endpoint">Endpunkt</string>
    <string name="name">Name</string>
-    <string name="restart">Verbindung neustarten</string>
+    <string name="restart">Tunnel neustarten</string>
    <string name="vpn_connection_failed">Verbindung fehlgeschlagen</string>
-    <string name="always_on_vpn_support">Erlaube Always-On VPN</string>
-    <string name="location_services_not_detected">Standortdienste Nicht Erkannt</string>
-    <string name="hint_search_packages">Suche packete</string>
-    <string name="clear_icon">Lösche Symbol</string>
+    <string name="always_on_vpn_support">Always-On VPN erlauben</string>
+    <string name="location_services_not_detected">Standortdienste nicht erkannt</string>
+    <string name="hint_search_packages">Pakete suchen</string>
    <string name="vpn_starting">VPN startet</string>
    <string name="db_name">wg-tunnel-db</string>
    <string name="scanning_qr">Scanne nach QR</string>
-    <string name="none">Keine vertrauenswürdigen WiFi Namen</string>
-    <string name="other">Andere</string>
+    <string name="none">Keine vertrauenswürdigen WLAN Namen</string>
+    <string name="other">Sonstige</string>
    <string name="vpn_on">VPN an</string>
    <string name="vpn_off">VPN aus</string>
    <string name="default_vpn_on">Primärer VPN an</string>
-    <string name="create_import">Starte von Grund auf neu</string>
-    <string name="turn_off_auto">Für diese Aktion muss automatisches Verbinden ausgeschaltet oder pausiert sein</string>
+    <string name="create_import">Von Grund auf neu erstellen</string>
+    <string name="turn_off_auto">Für diese Aktion muss Auto-Tunneln ausgeschaltet oder pausiert sein</string>
    <string name="add_peer">Peer hinzufügen</string>
    <string name="done">Erledigt</string>
-    <string name="rotate_keys">Schlüssel ändern</string>
+    <string name="rotate_keys">Schlüssel rotieren</string>
    <string name="private_key">Privater Schlüssel</string>
-    <string name="copy_public_key">Öffentlicher Schlüssel kopieren</string>
+    <string name="copy_public_key">Öffentlichen Schlüssel kopieren</string>
    <string name="base64_key">base64-Schlüssel</string>
    <string name="comma_separated_list">Kommaseparierte Liste</string>
    <string name="delete_tunnel">Tunnel löschen</string>
    <string name="persistent_keepalive">Dauerhaftes Keepalive</string>
    <string name="background_location_required">Hintergrund Standortdienste erforderlich</string>
-    <string name="enable_app_lock">App Sperre aktiviert</string>
+    <string name="enable_app_lock">App-Sperre aktivieren</string>
    <string name="discord_description">Tritt der Community bei</string>
    <string name="interface_">Schnittstelle</string>
    <string name="listen_port">Eingehender Port</string>
    <string name="random">(zufällig)</string>
-    <string name="optional">(nicht erforderlich)</string>
-    <string name="optional_no_recommend">(nicht erforderlich, aber empfohlen)</string>
+    <string name="optional">(optional)</string>
+    <string name="optional_no_recommend">(Optional, nicht empfohlen)</string>
    <string name="seconds">Sekunden</string>
    <string name="cancel">Abbrechen</string>
    <string name="preshared_key">Geteilter Schlüssel</string>
-    <string name="enabled_app_shortcuts">Aktiviere App Verknüpfungen</string>
-    <string name="exported_configs_message">Konfigurationen in den Download Ordner exportiert</string>
-    <string name="tunnel_on_wifi">Tunnel bei nicht vertrauenswürdigem Wifi</string>
+    <string name="enabled_app_shortcuts">App-Verknüpfungen aktivieren</string>
+    <string name="exported_configs_message">Konfigurationen in Download Ordner exportiert</string>
+    <string name="tunnel_on_wifi">Tunnel bei nicht vertrauenswürdigem WLAN</string>
    <string name="email_subject">WG Tunnel Unterstützung</string>
-    <string name="docs_description">Lese die Dokumentation</string>
+    <string name="docs_description">Dokumentation lesen</string>
    <string name="email_description">Sende mir eine E-Mail</string>
    <string name="support_help_text">Bei Fehlern oder Verbesserungsvorschlägen stehen folgende Ressourcen zur Verfügung:</string>
-    <string name="error_root_denied">Root Shell verboten</string>
+    <string name="error_root_denied">Root Shell verweigert</string>
    <string name="error_no_file_explorer">Kein Datei-Explorer installiert</string>
-    <string name="location_services_missing_message">Die App konnte keine aktivierten Standortdienste auf deinem Gerät erkennen. Dies kann auf manchen Geräten ein Auslesen des aktuellen WIFI-Names für die \"Nicht vertrauenswürdiges WIFI\" Funktion verhindern. Möchtest du trotzdem fortfahren ?</string>
+    <string name="location_services_missing_message">Die App erkennt keine auf deinem Gerät aktivierten Standortdienste. Je nach Gerät kann dies dazu führen, dass die Funktion \"Nicht vertrauenswürdiges WLAN\" den WLAN-Namen nicht lesen kann. Möchtest du trotzdem fortfahren?</string>
    <string name="auto_tunnel_title">Auto-Tunnel Service</string>
    <string name="delete_tunnel_message">Bist du sicher, dass du den Tunnel löschen möchtest?</string>
    <string name="yes">Ja</string>
@@ -103,55 +101,71 @@
    <string name="pause">Pausieren</string>
    <string name="paused">Pausiert</string>
    <string name="active">Aktiv</string>
-    <string name="go">Gehe</string>
-    <string name="excluded">Ausgeschlossen</string>
+    <string name="go">Los</string>
+    <string name="excluded">ausgeschlossen</string>
    <string name="all">Alle</string>
-    <string name="always_on_disabled">Always-on VPN wollte eine Tunnel starten, aber dieses Feature ist in den Einstellungen deaktiviert.</string>
-    <string name="no_browser_detected">Kein Browser erkannt</string>
-    <string name="open_issue">Öffne ein Issue</string>
-    <string name="read_logs">Lese die Logs</string>
+    <string name="always_on_disabled">Always-on VPN wollte einen Tunnel starten, aber dieses Feature ist in den Einstellungen deaktiviert.</string>
+    <string name="no_browser_detected">Keinen Browser erkannt</string>
+    <string name="open_issue">Issue öffnen</string>
+    <string name="read_logs">Logs lesen</string>
    <string name="auto">(automatisch)</string>
-    <string name="config_parse_error">Fehler beim lesen der Konfiguration</string>
-    <string name="incorrect_pin">PIN is nicht korrekt</string>
-    <string name="pin_created">PIN erfolgreich angelegt</string>
-    <string name="enter_pin">Gib deine PIN ein</string>
-    <string name="auto_off">Auto-Tunnel pausieren</string>
-    <string name="auto_tun_on">Auto-Tunnel fortsetzen</string>
-    <string name="auto_tun_off">Auto-Tunnel pausieren</string>
+    <string name="config_parse_error">Fehler beim Lesen der Konfiguration</string>
+    <string name="incorrect_pin">PIN nicht korrekt</string>
+    <string name="pin_created">PIN erfolgreich erstellt</string>
+    <string name="enter_pin">Deine PIN eingeben</string>
+    <string name="auto_off">Auto-Tunneln pausieren</string>
+    <string name="auto_tun_on">Auto-Tunneln fortsetzen</string>
+    <string name="auto_tun_off">Auto-Tunneln pausieren</string>
    <string name="version">Version</string>
    <string name="mode">Modus</string>
-    <string name="userspace">Userspace</string>
+    <string name="userspace">Benutzerfläche</string>
    <string name="settings">Einstellungen</string>
    <string name="support">Unterstützung</string>
-    <string name="watcher_channel_id">Beobachter Kanal</string>
+    <string name="watcher_channel_id">Wächterkanal</string>
    <string name="error_authentication_failed">Anmeldung fehlgeschlagen</string>
-    <string name="export_configs">Exportiere Konfigurationen</string>
-    <string name="unknown_error">Ein unbekannter Fehler ist aufgetreten</string>
+    <string name="export_configs">Konfigurationen exportieren</string>
+    <string name="unknown_error">Unbekannter Fehler aufgetreten</string>
    <string name="email_chooser">Sende eine E-Mail…</string>
-    <string name="error_authorization_failed">Fehler bei der Authorisierung</string>
+    <string name="error_authorization_failed">Autorisierung fehlgeschlagen</string>
    <string name="location_services_required">Standortdienste erforderlich</string>
    <string name="precise_location_required">Genauer Standort erforderlich</string>
-    <string name="error_invalid_code">Fehlerhafter QR code</string>
+    <string name="error_invalid_code">Ungültiger QR Code</string>
    <string name="error_none">Kein Fehler</string>
-    <string name="tunneling_apps">Tunnel Anwendungen</string>
-    <string name="included">Hinzugefügt</string>
-    <string name="no_email_detected">Keine E-Mail Anwendung erkannt</string>
+    <string name="tunneling_apps">Getunnelte Apps</string>
+    <string name="included">eingeschlossen</string>
+    <string name="no_email_detected">Keine E-Mail-App erkannt</string>
    <string name="logs_saved">Logs im Download Ordner gespeichert</string>
-    <string name="create_pin">Erstelle eine PIN</string>
-    <string name="use_tunnel_on_wifi_name">Tunnel in Wifi-Namen verwenden</string>
-    <string name="no_wifi_names_configured">Keine Wifi-Namen für diesen Tunnel konfiguriert</string>
+    <string name="create_pin">PIN erstellen</string>
+    <string name="use_tunnel_on_wifi_name">Tunnel für WLAN-Namen verwenden</string>
+    <string name="no_wifi_names_configured">Keine WLAN-Namen für diesen Tunnel konfiguriert</string>
    <string name="disabled">Deaktiviert</string>
    <string name="mobile_data_tunnel">Als Tunnel für Mobile Daten setzen</string>
    <string name="general">Allgemein</string>
    <string name="restart_on_ping">Neustart bei PING Fehler (Beta)</string>
    <string name="edit_tunnel">Tunnel bearbeiten</string>
    <string name="set_primary_tunnel">Als Primären Tunnel setzen</string>
-    <string name="auto_on">Auto-Tunnel fortsetzen</string>
+    <string name="auto_on">Auto-Tunneln fortsetzen</string>
    <string name="vpn_channel_id">VPN Kanal</string>
    <string name="vpn_channel_name">VPN Benachrichtigungskanal</string>
-    <string name="watcher_channel_name">Beobachter Benachrichtigungskanal</string>
+    <string name="watcher_channel_name">Wächterbenachrichtigungskanal</string>
    <string name="turn_off_tunnel">Aktion erfordert deaktivierten Tunnel</string>
    <string name="kernel">Kernel</string>
-    <string name="use_kernel">Verwende das Kernel Modul</string>
+    <string name="use_kernel">Kernelmodul verwenden</string>
    <string name="error_ssid_exists">SSID existiert bereits</string>
+    <string name="use_amnezia">"Amnezia Benutzerumgebung benutzen "</string>
+    <string name="junk_packet_count">Junk-Paket Anzahl</string>
+    <string name="junk_packet_maximum_size">Junk-Paket maximale Grösse</string>
+    <string name="init_packet_junk_size">Initial Junk-Paketgröße</string>
+    <string name="backend">Backend</string>
+    <string name="junk_packet_minimum_size">Junk-Paket minimale Grösse</string>
+    <string name="response_packet_junk_size">Antwort Junk-Paketgröße</string>
+    <string name="init_packet_magic_header">Initialpaket magic header</string>
+    <string name="getting_started_guide">Startanleitung erhalten</string>
+    <string name="transport_packet_magic_header">Transportpaket magic header</string>
+    <string name="underload_packet_magic_header">Unterlastpaket magic header</string>
+    <string name="see_the">Schaue das</string>
+    <string name="unsure_how">Wenn du nicht sicher bist, wie du weiterverfahren sollst</string>
+    <string name="export_configs_failed">Konfigurationsexport fehlgeschlagen</string>
+    <string name="error_file_format">Ungültige Konfiguration Tunnel-Format</string>
+    <string name="response_packet_magic_header">Antwortpaket magic header</string>
 </resources>
@@ -72,7 +72,6 @@
    <string name="always_on_vpn_support">Permitir VPN siempre-activada</string>
    <string name="location_services_not_detected">Servicios de Ubicación No Detectados</string>
    <string name="hint_search_packages">Buscar paquetes</string>
-    <string name="clear_icon">Icono claro</string>
    <string name="attempt_connection">Intentando conexión...</string>
    <string name="vpn_starting">Iniciando VPN</string>
    <string name="db_name">wg-tunnel-db</string>
@@ -106,7 +105,6 @@
    <string name="listen_port">Puerto de escucha</string>
    <string name="preshared_key">Clave previamente compartida</string>
    <string name="persistent_keepalive">Keepalive persistente</string>
-    <string name="search_icon">Icono de búsqueda</string>
    <string name="docs_description">Leer documentación</string>
    <string name="email_description">Envíame un email</string>
    <string name="support_help_text">Si tienes problemas, ideas para mejoras, o simlemente comprometerte, tienes disponibles los siguientes recursos:</string>
@@ -137,7 +135,7 @@
    <string name="pin_created">Pin creado con éxito</string>
    <string name="enter_pin">Introduce tu pin</string>
    <string name="create_pin">Crear pin</string>
-    <string name="enable_app_lock">Bloqueo de app activado</string>
+    <string name="enable_app_lock">Activar el bloqueo de aplicaciones</string>
    <string name="restart_on_ping">Reiniciar al fallar ping (beta)</string>
    <string name="set_primary_tunnel">Establecer como túnel Principal</string>
    <string name="no_wifi_names_configured">No hay nombres Wi-Fi configurados para este túnel</string>
@@ -154,4 +152,9 @@
    <string name="watcher_channel_id">Canal del obvervador</string>
    <string name="watcher_channel_name">Canal de notificación del obvervador</string>
    <string name="prominent_background_location_message">La monitorización SSID Wi-Fi necesita de permiso de ubicación en segundo plano incluso si la app está cerrada. Mira el enlace a la Política de Privacidad en la pantalla de ayuda para más detalles.</string>
+    <string name="export_configs_failed">Error al exportar la configuración</string>
+    <string name="use_amnezia">"Utilizar el entorno de usuario de Amnezia "</string>
+    <string name="junk_packet_count">Recuento de paquetes basura</string>
+    <string name="backend">Backend</string>
+    <string name="junk_packet_minimum_size">Tamaño mínimo del paquete basura</string>
 </resources>
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="tunnels">Tunele</string>
+    <string name="app_name">WG Tunnel</string>
+</resources>
@@ -0,0 +1,162 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="watcher_notification_text_active">Monitoramento de mudanças do estado da rede: Ativo</string>
+    <string name="watcher_notification_text_paused">Monitoramento de mudanças do estado da rede: pausado</string>
+    <string name="tunnel_start_title">VPN conectada</string>
+    <string name="tunnel_on_ethernet">Túnel na ethernet</string>
+    <string name="save_changes">Salvar</string>
+    <string name="public_key">Chave pública</string>
+    <string name="addresses">Endereços</string>
+    <string name="dns_servers">Servidores DNS</string>
+    <string name="endpoint">Endpoint</string>
+    <string name="name">Nome</string>
+    <string name="restart">Reiniciar Túnel</string>
+    <string name="create_import">Criar do zero</string>
+    <string name="turn_off_auto">Esta ação precisa do auto-túnel desativado ou pausado</string>
+    <string name="rotate_keys">Revezar chaves</string>
+    <string name="private_key">Chave privada</string>
+    <string name="base64_key">Chave base64</string>
+    <string name="optional_no_recommend">(opcional, não recomendado)</string>
+    <string name="preshared_key">Chave pré-compartilhada</string>
+    <string name="seconds">segundos</string>
+    <string name="export_configs">Exportar configurações</string>
+    <string name="export_configs_failed">Falhou ao exportar configurações</string>
+    <string name="go">ir</string>
+    <string name="error_no_file_explorer">Nenhum explorador de arquivos instalado</string>
+    <string name="error_invalid_code">Código QR inválido</string>
+    <string name="auto_tunnel_title">Serviço de Auto-túnel</string>
+    <string name="excluded">excluído</string>
+    <string name="all">todos</string>
+    <string name="enter_pin">Digite seu pin</string>
+    <string name="use_tunnel_on_wifi_name">Usar túnel em wifi com nome</string>
+    <string name="auto_tun_on">Continuar auto-túnel</string>
+    <string name="auto_tun_off">Pausar auto-túnel</string>
+    <string name="version">Versão</string>
+    <string name="mode">Modo</string>
+    <string name="use_amnezia">"Usar Amnezia em modo usuário "</string>
+    <string name="junk_packet_count">Número de pacotes-lixo</string>
+    <string name="junk_packet_minimum_size">Tamanho mínimo de pacote-lixo</string>
+    <string name="junk_packet_maximum_size">Tamanho máximo de pacote-lixo</string>
+    <string name="init_packet_junk_size">Tamanho de pacote-lixo inicial</string>
+    <string name="response_packet_junk_size">Tamanho de resposta de pacote-lixo</string>
+    <string name="app_name">WG Tunnel</string>
+    <string name="no_tunnels">Nenhum túnel foi adicionado!</string>
+    <string name="error_file_extension">O arquivo não é .conf ou .zip</string>
+    <string name="prominent_background_location_message">Este recurso precisa de permissões de localização em segundo plano para habilitar o monitoramento do SSID da rede Wi-Fi mesmo quando o aplicativo está fechado. Para mais detalhes, por favor veja a Política de Privacidade na tela de Suporte.</string>
+    <string name="turn_off_tunnel">Esta ação só é possível com o túnel inativo</string>
+    <string name="enabled_app_shortcuts">Habilitar atalhos do aplicativo</string>
+    <string name="notification_permission_required">Necessita permissões de notificação.</string>
+    <string name="add_trusted_ssid">Adicionar nome de Wi-Fi confiável</string>
+    <string name="enable_auto_tunnel">Iniciar auto-túnel</string>
+    <string name="tunnels">Túneis</string>
+    <string name="disable_auto_tunnel">Parar auto-túnel</string>
+    <string name="tunnel_start_text">Conectado ao túnel</string>
+    <string name="trusted_ssid_empty_description">Digite o SSID</string>
+    <string name="no_thanks">Não, obrigado</string>
+    <string name="privacy_policy">Ver a Política de Privacidade</string>
+    <string name="okay">OK</string>
+    <string name="tunnel_mobile_data">Túnel em dados móveis</string>
+    <string name="one_tunnel_required">Pelo menos um túnel é necessário para usar este recurso</string>
+    <string name="prominent_background_location_title">Revelar a localização em segundo plano</string>
+    <string name="thank_you">Obrigado por usar o WG Tunnel!</string>
+    <string name="trusted_ssid_value_description">Envie o SSID</string>
+    <string name="open_file">Abrir Arquivo</string>
+    <string name="add_from_qr">Adicionar a partir de código QR</string>
+    <string name="add_tunnels_text">Adicionar a partir de arquivo ou zip</string>
+    <string name="tunnel_all">Todos os aplicativos pelo túnel</string>
+    <string name="icon">Ícone</string>
+    <string name="turn_on">Ligar</string>
+    <string name="qr_scan">Escanear o código QR</string>
+    <string name="tunnel_name">Nome do Túnel</string>
+    <string name="add_tunnel">Adicionar Túnel</string>
+    <string name="config_changes_saved">Mudanças nas configurações salvas.</string>
+    <string name="exclude">Excluir</string>
+    <string name="include">Incluir</string>
+    <string name="map">Mapa</string>
+    <string name="vpn_connection_failed">Falha na conexão</string>
+    <string name="mtu">MTU</string>
+    <string name="always_on_vpn_support">Permitir VPN sempre ligada</string>
+    <string name="allowed_ips">IPs Permitidos</string>
+    <string name="attempt_connection">Tentando conexão..</string>
+    <string name="peer">Par</string>
+    <string name="location_services_not_detected">Serviço de localização não foi detectado</string>
+    <string name="hint_search_packages">Procurar pacotes</string>
+    <string name="vpn_starting">Iniciando VPN</string>
+    <string name="other">Outro</string>
+    <string name="scanning_qr">Escaneando código QR</string>
+    <string name="none">Nenhum nome de Wi-Fi confiável</string>
+    <string name="auto_tunneling">Auto-túnel</string>
+    <string name="default_vpn_on">VPN Principal ligada</string>
+    <string name="vpn_on">VPN ligada</string>
+    <string name="vpn_off">VPN desligada</string>
+    <string name="listen_port">Porta de escuta</string>
+    <string name="default_vpn_off">VPN Principal desligada</string>
+    <string name="turn_on_tunnel">Esta ação precisa um túnel ativo</string>
+    <string name="done">Feito</string>
+    <string name="add_peer">Adicionar par</string>
+    <string name="interface_">Interface</string>
+    <string name="copy_public_key">Copiar chave pública</string>
+    <string name="comma_separated_list">Lista separada por vírgulas</string>
+    <string name="optional">(opcional)</string>
+    <string name="random">(aleatório)</string>
+    <string name="persistent_keepalive">Manter a conexão persistente (keepalive)</string>
+    <string name="cancel">Cancelar</string>
+    <string name="error_authentication_failed">Autenticação falhou</string>
+    <string name="error_authorization_failed">Autorização falhou</string>
+    <string name="restart_on_ping">Reiniciar em falha de ping (beta)</string>
+    <string name="background_location_required">Necessita a localização em segundo plano</string>
+    <string name="location_services_required">Necessita dos serviços de localização</string>
+    <string name="email_description">Me envie um email</string>
+    <string name="error_ssid_exists">SSID já existe</string>
+    <string name="delete_tunnel_message">Tem certeza que você quer apagar este túnel?</string>
+    <string name="yes">Sim</string>
+    <string name="precise_location_required">Necessita da localização precisa</string>
+    <string name="exported_configs_message">Configurações exportadas para downloads</string>
+    <string name="unknown_error">Ocorreu um erro desconhecido</string>
+    <string name="email_subject">Suporte para o WG Tunnel</string>
+    <string name="tunnel_on_wifi">Túnel em Wi-Fi não confiável</string>
+    <string name="error_none">Nenhum erro</string>
+    <string name="delete_tunnel">Apagar túnel</string>
+    <string name="email_chooser">Enviar um email…</string>
+    <string name="use_kernel">Usar o módulo do kernel</string>
+    <string name="discord_description">Juntar-se à comunidade</string>
+    <string name="docs_description">Ler a documentação</string>
+    <string name="support_help_text">Se você enfrentar problemas, tiver ideias para melhorias ou apenas quiser participar, os seguintes recursos estão disponíveis:</string>
+    <string name="error_root_denied">Shell Root negado</string>
+    <string name="location_services_missing_message">O aplicativo não detectou o serviço de localização habilitado no seu dispositivo. Dependendo do dispositivo, isto pode causar que a função de Wi-Fi não confiável falhe em ler o nome do Wi-Fi. Quer continuar mesmo assim?</string>
+    <string name="paused">pausado</string>
+    <string name="included">incluso</string>
+    <string name="resume">Continuar</string>
+    <string name="pause">Pausar</string>
+    <string name="active">ativo</string>
+    <string name="always_on_disabled">VPN sempre ligada tentou iniciar um túnel, mas este recurso está desligado nas configurações.</string>
+    <string name="open_issue">Abrir um problema</string>
+    <string name="tunneling_apps">Aplicativos em túnel</string>
+    <string name="no_email_detected">Nenhum aplicativo de email detectado</string>
+    <string name="no_browser_detected">Nenhum navegador detectado</string>
+    <string name="logs_saved">Registros salvos em downloads</string>
+    <string name="incorrect_pin">O Pin está errado</string>
+    <string name="auto">(automático)</string>
+    <string name="disabled">desligado</string>
+    <string name="read_logs">Ler os registros</string>
+    <string name="config_parse_error">Falha na interpretação das configurações</string>
+    <string name="pin_created">Pin criado com sucesso</string>
+    <string name="auto_on">Continuar auto-túnel</string>
+    <string name="create_pin">Criar um pin</string>
+    <string name="enable_app_lock">Ligar trava de aplicativo</string>
+    <string name="no_wifi_names_configured">Nenhum Wi-Fi configurado para este túnel</string>
+    <string name="edit_tunnel">Editar túnel</string>
+    <string name="mobile_data_tunnel">Selecionar como túnel em dados móveis</string>
+    <string name="set_primary_tunnel">Selecionar como túnel principal</string>
+    <string name="general">Geral</string>
+    <string name="userspace">Modo usuário</string>
+    <string name="support">Suporte</string>
+    <string name="kernel">Kernel</string>
+    <string name="auto_off">Pausar auto-túnel</string>
+    <string name="backend">Backend</string>
+    <string name="settings">Configurações</string>
+    <string name="unsure_how">se não tiver certeza em como continuar</string>
+    <string name="see_the">Veja o</string>
+    <string name="getting_started_guide">guia de início rápido</string>
+    <string name="error_file_format">Formato de arquivo de configuração inválido</string>
+</resources>
@@ -1,3 +1,171 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    </resources>
+    <string name="turn_off_tunnel">Действие требует отключения туннеля</string>
+    <string name="add_tunnel">Добавить туннель</string>
+    <string name="mtu">MTU</string>
+    <string name="tunnel_name">Имя туннеля</string>
+    <string name="public_key">Публичный ключ</string>
+    <string name="name">Имя</string>
+    <string name="peer">Пир</string>
+    <string name="privacy_policy">Посмотреть политику конфиденциальности</string>
+    <string name="icon">Иконка</string>
+    <string name="turn_on">Включить</string>
+    <string name="add_from_qr">Добавить из QR</string>
+    <string name="qr_scan">Сканировать QR</string>
+    <string name="auto_tunneling">Авто-туннелирование</string>
+    <string name="no_tunnels">Туннели ещё не добавлены!</string>
+    <string name="open_file">Открыть файл</string>
+    <string name="exclude">Исключить</string>
+    <string name="include">Включить</string>
+    <string name="tunnel_all">Туннель для всех приложений</string>
+    <string name="config_changes_saved">Изменения конфигурации сохранены.</string>
+    <string name="save_changes">Сохранить</string>
+    <string name="no_thanks">Нет, спасибо</string>
+    <string name="map">Карта</string>
+    <string name="addresses">Адреса</string>
+    <string name="dns_servers">DNS-серверы</string>
+    <string name="allowed_ips">Разрешённые IP</string>
+    <string name="endpoint">Конечная точка</string>
+    <string name="restart">Перезапустить туннель</string>
+    <string name="vpn_connection_failed">Ошибка соединения</string>
+    <string name="always_on_vpn_support">Разрешить постоянный VPN</string>
+    <string name="hint_search_packages">Поиск приложений</string>
+    <string name="other">Другое</string>
+    <string name="vpn_on">VPN вкл.</string>
+    <string name="vpn_off">VPN откл.</string>
+    <string name="interface_">Интерфейс</string>
+    <string name="optional">(необязательно)</string>
+    <string name="optional_no_recommend">(необязательно, не рекомендуется)</string>
+    <string name="resume">Восстановить</string>
+    <string name="tunneling_apps">Туннелируемые приложения</string>
+    <string name="paused">приостановлено</string>
+    <string name="active">активно</string>
+    <string name="excluded">исключено</string>
+    <string name="all">все</string>
+    <string name="no_email_detected">Приложение для отправки почты не обнаружено</string>
+    <string name="enter_pin">Введите свой PIN-код</string>
+    <string name="enable_app_lock">Включить блокировку приложения</string>
+    <string name="restart_on_ping">Перезапуск при сбое пинга (бета)</string>
+    <string name="settings">Настройки</string>
+    <string name="support">Поддержка</string>
+    <string name="backend">Модуль</string>
+    <string name="use_amnezia">"Использовать модуль Amnezia режима пользователя "</string>
+    <string name="init_packet_junk_size">Начальный размер «мусорного» пакета</string>
+    <string name="response_packet_junk_size">Размер ответного «мусорного» пакета</string>
+    <string name="init_packet_magic_header">Заголовок пакета инициализации</string>
+    <string name="see_the">Смотрите</string>
+    <string name="tunnel_mobile_data">Туннелировать через мобильный интернет</string>
+    <string name="tunnel_on_ethernet">Туннелировать через Ethernet</string>
+    <string name="cancel">Отмена</string>
+    <string name="docs_description">Посмотреть документацию</string>
+    <string name="discord_description">Присоединиться к сообществу</string>
+    <string name="email_chooser">Отправить письмо…</string>
+    <string name="add_trusted_ssid">Добавить доверенное имя сети Wi-Fi</string>
+    <string name="included">включено</string>
+    <string name="vpn_starting">Идёт запуск VPN</string>
+    <string name="auto_tunnel_title">Сервис авто-туннелирования</string>
+    <string name="create_import">Создать с нуля</string>
+    <string name="private_key">Закрытый ключ</string>
+    <string name="pause">Приостановить</string>
+    <string name="logs_saved">Журнал сохранён в Загрузки</string>
+    <string name="db_name">wg-tunnel-db</string>
+    <string name="base64_key">Ключ в base64</string>
+    <string name="error_no_file_explorer">Не найден файловый менеджер</string>
+    <string name="delete_tunnel_message">Вы действительно хотите удалить этот туннель?</string>
+    <string name="version">Версия</string>
+    <string name="unknown_error">Неизвестная ошибка</string>
+    <string name="tunnel_on_wifi">Туннель в недоверенных сетях Wi-Fi</string>
+    <string name="error_file_extension">Файл не имеет расширение .conf или .zip</string>
+    <string name="random">(случайно)</string>
+    <string name="tunnel_start_text">Подключено к туннелю</string>
+    <string name="app_name">WG Tunnel</string>
+    <string name="vpn_channel_id">Канал VPN</string>
+    <string name="vpn_channel_name">Канал уведомлений VPN</string>
+    <string name="watcher_channel_id">Канал наблюдателя</string>
+    <string name="watcher_channel_name">Канал уведомлений наблюдателя</string>
+    <string name="watcher_notification_text_active">Отслеживание состояния сети: активно</string>
+    <string name="notification_permission_required">Требуется разрешение на отображение уведомлений.</string>
+    <string name="tunnels">Туннели</string>
+    <string name="enable_auto_tunnel">Запустить авто-туннель</string>
+    <string name="disable_auto_tunnel">Остановить авто-туннель</string>
+    <string name="one_tunnel_required">Для использования этой функции нужно настроить хотя бы один туннель</string>
+    <string name="okay">Хорошо</string>
+    <string name="prominent_background_location_title">Фоновая передача местоположения</string>
+    <string name="thank_you">Благодарим Вас за использование WG Tunnel!</string>
+    <string name="trusted_ssid_value_description">Отправить SSID</string>
+    <string name="trusted_ssid_empty_description">Введите SSID</string>
+    <string name="add_tunnels_text">Добавить из файла или архива</string>
+    <string name="location_services_not_detected">Сервисы местоположения не обнаружены</string>
+    <string name="attempt_connection">Попытка соединения…</string>
+    <string name="scanning_qr">Поиск QR-кода</string>
+    <string name="none">Нет доверенных имён Wi-Fi</string>
+    <string name="default_vpn_on">Основной VPN вкл.</string>
+    <string name="default_vpn_off">Основной VPN выкл.</string>
+    <string name="turn_off_auto">Необходимо приостановить или отключить авто-туннелирование</string>
+    <string name="turn_on_tunnel">Действие требует наличие активного туннеля</string>
+    <string name="add_peer">Добавить пира</string>
+    <string name="rotate_keys">Обновить ключи</string>
+    <string name="comma_separated_list">разделённый запятыми список</string>
+    <string name="listen_port">Порт прослушивания</string>
+    <string name="preshared_key">Общий ключ</string>
+    <string name="seconds">секунд</string>
+    <string name="persistent_keepalive">Поддержание работы туннеля (keepalive)</string>
+    <string name="error_authentication_failed">Сбой аутентификации</string>
+    <string name="export_configs">Экспорт конфигурации</string>
+    <string name="location_services_required">Необходимо наличие служб местоположения</string>
+    <string name="error_invalid_code">Некорректный QR-код</string>
+    <string name="location_services_missing_message">Приложение не обнаружило сервис местоположения на вашем устройстве. На некоторых устройствах это может привести к невозможности определения имени сети Wi-Fi и сбою функции недоверенной сети. Всё равно продолжить?</string>
+    <string name="error_ssid_exists">SSID уже существует</string>
+    <string name="error_root_denied">Root-доступ запрещён</string>
+    <string name="error_none">Нет ошибки</string>
+    <string name="delete_tunnel">Удалить туннель</string>
+    <string name="yes">Да</string>
+    <string name="use_tunnel_on_wifi_name">Использовать туннель в сети Wi-Fi</string>
+    <string name="disabled">отключено</string>
+    <string name="auto_off">Приостановить авто-туннель</string>
+    <string name="auto_tun_on">Восстановить авто-туннель</string>
+    <string name="watcher_notification_text_paused">Отслеживание состояния сети: приостановлено</string>
+    <string name="tunnel_start_title">VPN подключен</string>
+    <string name="prominent_background_location_message">Эта функция требует фоновый доступ к местоположению для отслеживания имён сетей Wi-Fi, даже когда приложение закрыто. Для получения дополнительной информации, прочтите политику конфиденциальности на экране поддержки.</string>
+    <string name="done">Готово</string>
+    <string name="copy_public_key">Копировать открытый ключ</string>
+    <string name="error_authorization_failed">Не удалось пройти аутентификацию</string>
+    <string name="enabled_app_shortcuts">Включить ярлыки приложения</string>
+    <string name="export_configs_failed">Не удалось экспортировать конфигурацию</string>
+    <string name="precise_location_required">Необходимо точное местоположение</string>
+    <string name="open_issue">Сообщить о проблеме</string>
+    <string name="config_parse_error">Не удалось разобрать файл конфигурации</string>
+    <string name="incorrect_pin">Некорректный PIN-код</string>
+    <string name="pin_created">PIN создан успешно</string>
+    <string name="create_pin">Создать PIN-код</string>
+    <string name="mobile_data_tunnel">Назначить как туннель для мобильного интернета</string>
+    <string name="edit_tunnel">Редактировать туннель</string>
+    <string name="auto_on">Восстановить авто-туннель</string>
+    <string name="auto_tun_off">Приостановить авто-туннель</string>
+    <string name="junk_packet_count">Количество «мусорных» пакетов</string>
+    <string name="junk_packet_maximum_size">Максимальный размер «мусорного» пакета</string>
+    <string name="error_file_format">некорректный формат конфигурации туннеля</string>
+    <string name="background_location_required">Необходим фоновый доступ к местоположению</string>
+    <string name="exported_configs_message">Экспорт конфигурации в Загрузки</string>
+    <string name="email_subject">Поддержка WG Tunnel</string>
+    <string name="go">вперёд</string>
+    <string name="email_description">Отправить письмо автору</string>
+    <string name="support_help_text">Если у Вас возникли проблемы, или появилась идея по улучшению, или Вы просто хотите пообщаться, используйте следующие ресурсы:</string>
+    <string name="use_kernel">Использовать модуль режима ядра</string>
+    <string name="always_on_disabled">Функция всегда доступного VPN попыталась запустить туннель, но эта функция отключена в настройках.</string>
+    <string name="no_browser_detected">Веб-браузер не обнаружен</string>
+    <string name="read_logs">Посмотреть журнал</string>
+    <string name="auto">(авто)</string>
+    <string name="set_primary_tunnel">Назначить как главный туннель</string>
+    <string name="no_wifi_names_configured">Имена сетей Wi-Fi не назначены этому туннелю</string>
+    <string name="general">Общее</string>
+    <string name="mode">Режим</string>
+    <string name="userspace">Пользователя</string>
+    <string name="kernel">Модуль ядра</string>
+    <string name="junk_packet_minimum_size">Минимальный размер «мусорного» пакета</string>
+    <string name="response_packet_magic_header">Заголовок пакета ответа</string>
+    <string name="transport_packet_magic_header">Заголовок транспортного пакета</string>
+    <string name="getting_started_guide">руководство по началу работы</string>
+    <string name="unsure_how">, если не уверены, что делать дальше</string>
+    <string name="underload_packet_magic_header">Заголовок пакета под нагрузкой</string>
+</resources>
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <resources>
    <string name="app_name">WG Tunnel</string>
    <string name="vpn_channel_id">VPN Kanalı</string>
@@ -8,38 +7,38 @@
    <string name="github_url" translatable="false">https://github.com/zaneschepke/wgtunnel/issues</string>
    <string name="docs_url" translatable="false">https://zaneschepke.com/wgtunnel-docs/overview.html</string>
    <string name="privacy_policy_url" translatable="false">https://zaneschepke.com/wgtunnel-docs/privacypolicy.html</string>
-    <string name="error_file_extension">Dosya bir .conf veya .zip değil</string>
-    <string name="turn_off_tunnel">Eylem tünelin kapalı olmasını gerektiriyor</string>
-    <string name="no_tunnels">Henüz bir tünel ekli değil!</string>
+    <string name="error_file_extension">Dosya .conf veya .zip değil</string>
+    <string name="turn_off_tunnel">İşlem için tünelin kapalı olması gerekiyor</string>
+    <string name="no_tunnels">Henüz tünel eklenmedi!</string>
    <string name="discord_url" translatable="false">https://discord.gg/rbRRNh6H7V</string>
-    <string name="watcher_notification_text_active">Ağ durumu değişikliklerini izleme: etkin</string>
-    <string name="watcher_notification_text_paused">Ağ durumu değişikliklerini izleme: duraklatıldı</string>
+    <string name="watcher_notification_text_active">Ağ durum değişiklikleri izleniyor: aktif</string>
+    <string name="watcher_notification_text_paused">Ağ durum değişiklikleri izleniyor: duraklatıldı</string>
    <string name="tunnel_start_title">VPN bağlandı</string>
-    <string name="tunnel_start_text">Tünele bağlı</string>
+    <string name="tunnel_start_text">Tünele bağlandı</string>
    <string name="notification_permission_required">Bildirim izni gerekli.</string>
-    <string name="add_trusted_ssid">Güvenilir Wi-Fi adı ekle</string>
+    <string name="add_trusted_ssid">Güvenilir wifi adı ekle</string>
    <string name="tunnels">Tüneller</string>
    <string name="enable_auto_tunnel">Otomatik tünellemeyi başlat</string>
    <string name="disable_auto_tunnel">Otomatik tünellemeyi durdur</string>
-    <string name="tunnel_mobile_data">Mobil veri üzerinde tünel</string>
-    <string name="one_tunnel_required">Bu özelliği kullanabilmek için en az bir tünel gereklidir.</string>
-    <string name="privacy_policy">Gizlilik Politikası</string>
+    <string name="tunnel_mobile_data">Mobil veride tünel</string>
+    <string name="one_tunnel_required">Bu özelliği kullanmak için en az bir tünel gerekli</string>
+    <string name="privacy_policy">Gizlilik Politikasını Görüntüle</string>
    <string name="okay">Tamam</string>
-    <string name="tunnel_on_ethernet">Ethernet üzerinde tünel</string>
-    <string name="prominent_background_location_message">Bu özellik, uygulama kapalıyken bile Wi-Fi SSID izlemesini etkinleştirmek için arka plan konumu izni gerektirir. Daha fazla bilgi için lütfen Destek ekranında bağlantısı verilen Gizlilik Politikasına bakın.</string>
+    <string name="tunnel_on_ethernet">Ethernet\'te tünel</string>
+    <string name="prominent_background_location_message">Bu özellik, uygulama kapalıyken bile Wi-Fi SSID izlemesini etkinleştirmek için arka plan konum iznine ihtiyaç duyar. Daha fazla ayrıntı için lütfen Destek ekranında bağlantısı verilen Gizlilik Politikasına bakın.</string>
    <string name="prominent_background_location_title">Arka Plan Konum Açıklaması</string>
-    <string name="thank_you">WG Tunnel\'i kullandığınız için teşekkür ederiz!</string>
-    <string name="trusted_ssid_empty_description">SSID\'yi gir</string>
+    <string name="thank_you">WG Tunnel\'ı kullandığınız için teşekkürler!</string>
+    <string name="trusted_ssid_empty_description">SSID girin</string>
    <string name="trusted_ssid_value_description">SSID\'yi gönder</string>
-    <string name="add_tunnels_text">Dosyadan veya ZIP\'ten ekle</string>
+    <string name="add_tunnels_text">Dosyadan veya zip\'ten ekle</string>
    <string name="open_file">Dosya Aç</string>
    <string name="add_from_qr">QR kodundan ekle</string>
-    <string name="qr_scan">QR kodu tarat</string>
-    <string name="tunnel_name">Tünel adı</string>
-    <string name="add_tunnel">Tünel ekle</string>
+    <string name="qr_scan">QR Tarama</string>
+    <string name="tunnel_name">Tünel Adı</string>
+    <string name="add_tunnel">Tünel Ekle</string>
    <string name="exclude">Hariç tut</string>
    <string name="include">Dahil et</string>
-    <string name="tunnel_all">Tüm uygulamaları dahil et</string>
+    <string name="tunnel_all">Tüm uygulamaları tünelle</string>
    <string name="config_changes_saved">Yapılandırma değişiklikleri kaydedildi.</string>
    <string name="save_changes">Kaydet</string>
    <string name="icon">Simge</string>
@@ -55,17 +54,15 @@
    <string name="endpoint">Uç nokta (endpoint)</string>
    <string name="name">Ad</string>
    <string name="restart">Tüneli Yeniden Başlat</string>
-    <string name="vpn_connection_failed">Bağlantı kurulamadı</string>
+    <string name="vpn_connection_failed">Bağlantı başarısız</string>
    <string name="always_on_vpn_support">Her Zaman Açık VPN\'e İzin Ver</string>
    <string name="location_services_not_detected">Konum Hizmetleri Algılanmadı</string>
-    <string name="hint_search_packages">Uygulama arayın</string>
-    <string name="clear_icon">Simgeyi Temizle</string>
-    <string name="search_icon">Simge Ara</string>
-    <string name="attempt_connection">Bağlantı kurulmaya çalışılıyor..</string>
+    <string name="hint_search_packages">Paketlerde ara</string>
+    <string name="attempt_connection">Bağlantı deneniyor..</string>
    <string name="vpn_starting">VPN başlatılıyor</string>
    <string name="db_name">wg-tunnel-db</string>
-    <string name="scanning_qr">QR taranıyor</string>
-    <string name="none">Güvenilir Wi-Fi adı yok</string>
+    <string name="scanning_qr">QR için taranıyor</string>
+    <string name="none">Güvenilir wifi adı yok</string>
    <string name="other">Diğer</string>
    <string name="auto_tunneling">Otomatik tünelleme</string>
    <string name="vpn_on">VPN açık</string>
@@ -73,50 +70,50 @@
    <string name="default_vpn_on">Birincil VPN açık</string>
    <string name="default_vpn_off">Birincil VPN kapalı</string>
    <string name="create_import">Sıfırdan oluştur</string>
-    <string name="turn_off_auto">Eylem, otomatik tünelin devre dışı bırakılmasını veya duraklatılmasını gerektirir</string>
-    <string name="turn_on_tunnel">Eylem aktif tünel gerektirir</string>
-    <string name="add_peer">Eş (peer) ekle</string>
+    <string name="turn_off_auto">İşlem için otomatik tünelin devre dışı veya duraklatılmış olması gerekiyor</string>
+    <string name="turn_on_tunnel">İşlem için aktif tünel gerekiyor</string>
+    <string name="add_peer">Eş ekle</string>
    <string name="done">Tamam</string>
    <string name="interface_">Arayüz</string>
-    <string name="rotate_keys">Tuşları döndür</string>
+    <string name="rotate_keys">Anahtarları döndür</string>
    <string name="private_key">Özel anahtar</string>
    <string name="copy_public_key">Genel anahtarı kopyala</string>
-    <string name="base64_key">Base64 anahtarı</string>
-    <string name="comma_separated_list">Virgül ile ayrılmış liste ekleyin</string>
-    <string name="listen_port">Bağlantı noktası</string>
-    <string name="random">(Rastgele)</string>
-    <string name="optional">(İsteğe bağlı)</string>
-    <string name="optional_no_recommend">(İsteğe bağlı, önerilmez)</string>
-    <string name="preshared_key">Ön paylaşımlı anahtar</string>
+    <string name="base64_key">base64 anahtar</string>
+    <string name="comma_separated_list">virgülle ayrılmış liste</string>
+    <string name="listen_port">Dinleme portu</string>
+    <string name="random">(rastgele)</string>
+    <string name="optional">(isteğe bağlı)</string>
+    <string name="optional_no_recommend">(isteğe bağlı, önerilmez)</string>
+    <string name="preshared_key">Önceden paylaşılmış anahtar</string>
    <string name="seconds">saniye</string>
-    <string name="persistent_keepalive">Kalıcı olarak canlı tutma</string>
+    <string name="persistent_keepalive">Kalıcı canlı tutma</string>
    <string name="cancel">İptal</string>
    <string name="error_authentication_failed">Kimlik doğrulama başarısız oldu</string>
-    <string name="error_authorization_failed">Yetkilendirilemedi</string>
+    <string name="error_authorization_failed">Yetkilendirme başarısız oldu</string>
    <string name="enabled_app_shortcuts">Uygulama kısayollarını etkinleştir</string>
    <string name="export_configs">Yapılandırmaları dışa aktar</string>
-    <string name="location_services_required">Gerekli konum hizmetleri</string>
+    <string name="export_configs_failed">Yapılandırmaları dışa aktarma başarısız oldu</string>
+    <string name="location_services_required">Konum hizmetleri gerekli</string>
    <string name="background_location_required">Arka plan konumu gerekli</string>
-    <string name="precise_location_required">Kesin konum gerekli</string>
+    <string name="precise_location_required">Hassas konum gerekli</string>
    <string name="unknown_error">Bilinmeyen bir hata oluştu</string>
-    <string name="exported_configs_message">Yapılandırmalar indirilenler\'e aktarıldı</string>
-    <string name="tunnel_on_wifi">Güvenilmeyen kablosuz internet bağlantısında tünel</string>
+    <string name="exported_configs_message">Yapılandırmalar indirilenler klasörüne aktarıldı</string>
+    <string name="tunnel_on_wifi">Güvenilmeyen wifi\'da tünel</string>
    <string name="my_email" translatable="false">support@zaneschepke.com</string>
    <string name="email_subject">WG Tunnel Desteği</string>
-    <string name="email_chooser">Bir e-posta gönderin…</string>
+    <string name="email_chooser">E-posta gönder…</string>
    <string name="go">git</string>
    <string name="docs_description">Belgeleri oku</string>
    <string name="discord_description">Topluluğa katıl</string>
    <string name="email_description">Bana e-posta gönder</string>
-    <string name="support_help_text">Sorun yaşıyorsanız, iyileştirme fikirleriniz varsa veya sadece etkileşimde bulunmak istiyorsanız, aşağıdaki kaynaklar mevcuttur:</string>
-    <string name="kernel">Çekirdek</string>
-    <string name="use_kernel">Çekirdek modülünü kullan</string>
-    <string name="error_ssid_exists">SSID zaten var</string>
-    <string name="error_root_denied">Kök kabuğu reddedildi</string>
-    <string name="error_no_file_explorer">Yüklü dosya gezgini yok</string>
+    <string name="support_help_text">Sorun yaşıyorsanız, iyileştirme fikirleriniz varsa veya sadece iletişime geçmek istiyorsanız, aşağıdaki kaynaklar mevcuttur:</string>
+    <string name="use_kernel">Kernel modülünü kullan</string>
+    <string name="error_ssid_exists">SSID zaten mevcut</string>
+    <string name="error_root_denied">Root kabuğu reddedildi</string>
+    <string name="error_no_file_explorer">Dosya gezgini yüklü değil</string>
    <string name="error_invalid_code">Geçersiz QR kodu</string>
    <string name="error_none">Hata yok</string>
-    <string name="location_services_missing_message">Uygulama, cihazınızda etkinleştirilen herhangi bir konum hizmeti algılamıyor. Cihaza bağlı olarak bu, güvenilmeyen Wi-Fi özelliğinin Wi-Fi adını okuyamamasına neden olabilir. Yine de devam etmek ister misiniz?</string>
+    <string name="location_services_missing_message">Uygulama, cihazınızda etkinleştirilmiş herhangi bir konum hizmeti algılamıyor. Cihaza bağlı olarak, bu durum güvenilmeyen wifi özelliğinin wifi adını okumasını engelleyebilir. Yine de devam etmek istiyor musunuz?</string>
    <string name="auto_tunnel_title">Otomatik Tünel Hizmeti</string>
    <string name="delete_tunnel">Tüneli sil</string>
    <string name="delete_tunnel_message">Bu tüneli silmek istediğinizden emin misiniz?</string>
@@ -126,37 +123,58 @@
    <string name="paused">duraklatıldı</string>
    <string name="active">aktif</string>
    <string name="tunneling_apps">Tünellenen uygulamalar</string>
-    <string name="included">dahil edildi</string>
-    <string name="excluded">hariç tutuldu</string>
+    <string name="included">dahil</string>
+    <string name="excluded">hariç</string>
    <string name="all">tümü</string>
-    <string name="always_on_disabled">Her zaman açık VPN bir tünel başlatmaya çalıştı, ancak bu özellik ayarlarda devre dışı bırakıldı.</string>
+    <string name="always_on_disabled">Her Zaman Açık VPN bir tüneli başlatmaya çalıştı, ancak bu özellik ayarlarda devre dışı bırakılmış.</string>
    <string name="no_email_detected">E-posta uygulaması algılanmadı</string>
    <string name="no_browser_detected">Tarayıcı algılanmadı</string>
-    <string name="logs_saved">İndirilenlere kaydedilen günlükler</string>
-    <string name="open_issue">Bir sorun bildir</string>
+    <string name="logs_saved">Günlükler indirilenler klasörüne kaydedildi</string>
+    <string name="open_issue">Sorun bildir</string>
    <string name="read_logs">Günlükleri oku</string>
-    <string name="auto">(Otomatik)</string>
-    <string name="config_parse_error">Yapılandırma kaydedilemedi</string>
-    <string name="incorrect_pin">PIN kodu yanlış</string>
-    <string name="pin_created">Pin başarıyla oluşturuldu</string>
-    <string name="enter_pin">PIN kodunuzu girin</string>
-    <string name="create_pin">PIN kodu oluştur</string>
+    <string name="auto">(otomatik)</string>
+    <string name="config_parse_error">Yapılandırma ayrıştırılamadı</string>
+    <string name="incorrect_pin">PIN yanlış</string>
+    <string name="pin_created">PIN başarıyla oluşturuldu</string>
+    <string name="enter_pin">PIN\'inizi girin</string>
+    <string name="create_pin">PIN oluştur</string>
    <string name="enable_app_lock">Uygulama kilidini etkinleştir</string>
    <string name="restart_on_ping">Ping başarısız olduğunda yeniden başlat (beta)</string>
    <string name="mobile_data_tunnel">Mobil veri tüneli olarak ayarla</string>
    <string name="set_primary_tunnel">Birincil tünel olarak ayarla</string>
-    <string name="use_tunnel_on_wifi_name">Wi-Fi adında tünel kullan</string>
-    <string name="no_wifi_names_configured">Bu tünel için yapılandırılmış Wi-Fi adı yok</string>
+    <string name="use_tunnel_on_wifi_name">Wifi adında tünel kullan</string>
+    <string name="no_wifi_names_configured">Bu tünel için yapılandırılmış wifi adı yok</string>
    <string name="general">Genel</string>
    <string name="edit_tunnel">Tüneli düzenle</string>
-    <string name="disabled">Devre dışı</string>
-    <string name="auto_on">Otomatik ayarlamayı sürdür</string>
-    <string name="auto_off">Otomatik ayarlamayı duraklat</string>
-    <string name="auto_tun_on">Otomatik tüneli sürdür</string>
+    <string name="disabled">devre dışı</string>
+    <string name="auto_on">Otomatik tüneli devam ettir</string>
+    <string name="auto_off">Otomatik tüneli duraklat</string>
+    <string name="auto_tun_on">Otomatik tüneli devam ettir</string>
    <string name="auto_tun_off">Otomatik tüneli duraklat</string>
    <string name="version">Sürüm</string>
    <string name="mode">Mod</string>
    <string name="userspace">Kullanıcı alanı</string>
    <string name="settings">Ayarlar</string>
    <string name="support">Destek</string>
-</resources>
+    <string name="backend">Arka uç</string>
+    <string name="kernel">Çekirdek</string>
+    <string name="use_amnezia">"Amnezia kullanıcı alanını kullan "</string>
+    <string name="junk_packet_count">Gereksiz paket sayısı</string>
+    <string name="junk_packet_minimum_size">Gereksiz paket minimum boyutu</string>
+    <string name="junk_packet_maximum_size">Gereksiz paket maksimum boyutu</string>
+    <string name="init_packet_junk_size">Başlatma paketi gereksiz boyutu</string>
+    <string name="response_packet_junk_size">Yanıt paketi gereksiz boyutu</string>
+    <string name="init_packet_magic_header">Başlatma paketi sihirli başlığı</string>
+    <string name="response_packet_magic_header">Yanıt paketi sihirli başlığı</string>
+    <string name="transport_packet_magic_header">Taşıma paketi sihirli başlığı</string>
+    <string name="underload_packet_magic_header">Düşük yük paketi sihirli başlığı</string>
+    <string name="telegram_url" translatable="false">https://t.me/wgtunnel</string>
+    <string name="unsure_how">nasıl devam edeceğinizden emin değilseniz</string>
+    <string name="see_the">Bakın:</string>
+    <string name="getting_started_url" translatable="false">https://zaneschepke.com/wgtunnel-docs/getting-started.html</string>
+    <string name="getting_started_guide">başlangıç kılavuzu</string>
+    <string name="amnezia" translatable="false">Amnezia</string>
+    <string name="wireguard" translatable="false">WireGuard</string>
+    <string name="error_file_format">Geçersiz tünel yapılandırma formatı</string>
+    <string name="restart_at_boot">Önyüklemede yeniden başlat</string>
+</resources>
@@ -0,0 +1,169 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="comma_separated_list">список розділений комами</string>
+    <string name="no_tunnels">Тунелі ще не додані!</string>
+    <string name="app_name">WG Tunnel</string>
+    <string name="add_trusted_ssid">Додати ім\'я довіреної мережі Wi-Fi</string>
+    <string name="tunnels">Тунелі</string>
+    <string name="enable_auto_tunnel">Запустити авто-тунелі</string>
+    <string name="disable_auto_tunnel">Зупинити авто-тунелі</string>
+    <string name="okay">ОК</string>
+    <string name="tunnel_on_ethernet">Тунелювати Ethernet</string>
+    <string name="prominent_background_location_title">Фонова передача місцезнаходження</string>
+    <string name="trusted_ssid_value_description">Підтвердити SSID</string>
+    <string name="qr_scan">Сканувати QR</string>
+    <string name="tunnel_name">Ім\'я тунелю</string>
+    <string name="add_tunnel">Додати тунель</string>
+    <string name="include">Включити</string>
+    <string name="tunnel_all">Тунель для всіх додатків</string>
+    <string name="config_changes_saved">Зміни налаштувань збережено.</string>
+    <string name="icon">Іконка</string>
+    <string name="no_thanks">Ні, дякую</string>
+    <string name="default_vpn_off">Основний VPN вимк.</string>
+    <string name="turn_on_tunnel">Дія потребує активного тунелю</string>
+    <string name="rotate_keys">Оновити ключі</string>
+    <string name="private_key">Закритий ключ</string>
+    <string name="base64_key">Ключ в base64</string>
+    <string name="random">(випадково)</string>
+    <string name="optional">(необов\'язково)</string>
+    <string name="optional_no_recommend">(необов\'язково, не рекомендується)</string>
+    <string name="cancel">Скасувати</string>
+    <string name="export_configs_failed">Помилка експорту конфігурації</string>
+    <string name="location_services_required">Необхідно сервіси місцезнаходження</string>
+    <string name="precise_location_required">Необхідно доступ до точного місцезнаходження</string>
+    <string name="exported_configs_message">Експорт конфігурації в Завантаження</string>
+    <string name="email_chooser">Надіслати E-Mail…</string>
+    <string name="error_root_denied">Root доступ заборонено</string>
+    <string name="error_invalid_code">Некоректний QR-код</string>
+    <string name="error_none">Нема помилок</string>
+    <string name="logs_saved">Логи збережено в Завантаженнях</string>
+    <string name="config_parse_error">Помилка аналізу файлу конфігурації</string>
+    <string name="incorrect_pin">Невірний PIN-код</string>
+    <string name="use_tunnel_on_wifi_name">Використовувати тунель в мережі Wi-Fi</string>
+    <string name="disabled">відключено</string>
+    <string name="version">Версія</string>
+    <string name="mode">Режим</string>
+    <string name="transport_packet_magic_header">Заголовок транспортного пакету</string>
+    <string name="getting_started_guide">інструкція щодо початку роботи</string>
+    <string name="error_file_format">некоректний формат конфігурації тунелю</string>
+    <string name="watcher_notification_text_active">Моніторинг стану мережі: активний</string>
+    <string name="vpn_channel_name">Канал сповіщення VPN</string>
+    <string name="vpn_channel_id">Канал VPN</string>
+    <string name="error_file_extension">Файл не є .conf або .zip файлом</string>
+    <string name="turn_off_tunnel">Дія потребує вимкнення тунелю</string>
+    <string name="watcher_notification_text_paused">Моніторинг стану мережі: призупинено</string>
+    <string name="tunnel_start_text">Підключення до тунелю</string>
+    <string name="tunnel_start_title">VPN підключено</string>
+    <string name="notification_permission_required">Потрібен дозвіл на відображення сповіщень.</string>
+    <string name="tunnel_mobile_data">Тунелювати мобільні дані</string>
+    <string name="one_tunnel_required">Для використання даної функції потрібно налаштувати мінімум один тунель</string>
+    <string name="privacy_policy">Переглянути політику конфіденційності</string>
+    <string name="thank_you">Спасибі за використання WG Tunnel!</string>
+    <string name="prominent_background_location_message">Дана функція потребує фоновий доступ до служби місцезнаходження для моніторингу назви мереж Wi-Fi навіть коли додаток закрито. Для отримання додаткової інформації прочитайте політику приватності на екрані Підтримки.</string>
+    <string name="trusted_ssid_empty_description">Введіть SSID</string>
+    <string name="add_tunnels_text">Додати з файлу або архіву</string>
+    <string name="open_file">Відкрити файл</string>
+    <string name="exclude">Виключити</string>
+    <string name="add_from_qr">Додати з QR коду</string>
+    <string name="save_changes">Зберегти</string>
+    <string name="turn_on">Увімкнути</string>
+    <string name="map">Карта</string>
+    <string name="public_key">Публічний ключ</string>
+    <string name="addresses">Адреса</string>
+    <string name="allowed_ips">Дозволені IP</string>
+    <string name="dns_servers">DNS-сервери</string>
+    <string name="mtu">MTU</string>
+    <string name="peer">Пір</string>
+    <string name="endpoint">Кінцева точка</string>
+    <string name="hint_search_packages">Пошук програм</string>
+    <string name="name">Ім\'я</string>
+    <string name="vpn_connection_failed">Помилка з\'єднання</string>
+    <string name="restart">Перезапустити тунель</string>
+    <string name="always_on_vpn_support">Дозволили Always-ON VPN</string>
+    <string name="location_services_not_detected">Сервіси місце знаходження не знайдено</string>
+    <string name="db_name">wg-tunnel-db</string>
+    <string name="scanning_qr">Сканування QR коду</string>
+    <string name="attempt_connection">Спроба з\'єднання...</string>
+    <string name="other">Інше</string>
+    <string name="vpn_starting">Запуск VPN</string>
+    <string name="auto_tunneling">Авто-тунелювання</string>
+    <string name="none">Нема довірених мереж Wi-Fi</string>
+    <string name="vpn_on">VPN увімк.</string>
+    <string name="vpn_off">VPN вимк.</string>
+    <string name="default_vpn_on">Основний VPN увімк.</string>
+    <string name="create_import">Створити з нуля</string>
+    <string name="turn_off_auto">Необхідно вимкнути або призупинити авто-тунелювання</string>
+    <string name="add_peer">Додати peer</string>
+    <string name="done">Готово</string>
+    <string name="interface_">Інтерфейс</string>
+    <string name="copy_public_key">Копіювати відкритий ключ</string>
+    <string name="listen_port">Слухати порт</string>
+    <string name="preshared_key">Pre-shared key</string>
+    <string name="seconds">секунд</string>
+    <string name="persistent_keepalive">Persistent keepalive</string>
+    <string name="error_authorization_failed">Не вдалося авторизуватися</string>
+    <string name="enabled_app_shortcuts">Дозволити ярлики</string>
+    <string name="error_authentication_failed">Помилка автентифікації</string>
+    <string name="export_configs">Експорт конфігурації</string>
+    <string name="background_location_required">Необхідний фоновий доступ до місцезнаходження</string>
+    <string name="unknown_error">Невідома помилка</string>
+    <string name="tunnel_on_wifi">Тунелювати недовірені мережі Wi-Fi</string>
+    <string name="email_subject">Підтримка WG-Tunnel</string>
+    <string name="go">вперед</string>
+    <string name="docs_description">Переглянути документацію</string>
+    <string name="email_description">Відправити email автору</string>
+    <string name="discord_description">Приєднатися до спільноти</string>
+    <string name="support_help_text">Якщо у вас виникли проблеми, є ідеї щодо покращення, чи бажання долучитися, скористайтесь наступними ресурсами:</string>
+    <string name="use_kernel">Використовувати модуль режиму ядра</string>
+    <string name="error_ssid_exists">SSID вже існує</string>
+    <string name="error_no_file_explorer">Не знайдено файловий менеджер</string>
+    <string name="auto_tunnel_title">Сервіс авто-тунелювання</string>
+    <string name="delete_tunnel">Видалити тунель</string>
+    <string name="location_services_missing_message">Додаток не знайшов служб місце знаходження на вашому пристрої. На деяких пристроях це може привести до неможливості визначення назви мережі Wi-Fi і помилок функції недовірених Wi-Fi мереж. Все рівно хочете продовжити?</string>
+    <string name="included">включено</string>
+    <string name="delete_tunnel_message">Ви дійсно хочете видалити цей тунель?</string>
+    <string name="yes">Так</string>
+    <string name="active">активно</string>
+    <string name="resume">Відновити</string>
+    <string name="pause">Призупинити</string>
+    <string name="paused">призупинено</string>
+    <string name="tunneling_apps">Тунельовані додатки</string>
+    <string name="excluded">виключено</string>
+    <string name="always_on_disabled">Функція Always-on VPN спробувала запустити тунель, але функція вимкнена в налаштуваннях.</string>
+    <string name="auto">(авто)</string>
+    <string name="all">всі</string>
+    <string name="no_email_detected">Програми для надсилання email не знайдено</string>
+    <string name="open_issue">Повідомити про проблему</string>
+    <string name="read_logs">Переглянути логи</string>
+    <string name="no_browser_detected">Веб браузер не знайдено</string>
+    <string name="pin_created">PIN-код створено успішно</string>
+    <string name="enter_pin">Введіть PIN-код</string>
+    <string name="create_pin">Створити PINhкод</string>
+    <string name="enable_app_lock">Увімкнути блокування додатку</string>
+    <string name="edit_tunnel">Редагувати тунель</string>
+    <string name="auto_on">Відновити авто-тунель</string>
+    <string name="restart_on_ping">Перезапуск при помилці ping (бета)</string>
+    <string name="mobile_data_tunnel">Встановити як тунель для мобільних даних</string>
+    <string name="set_primary_tunnel">Встановити як основний тунель</string>
+    <string name="no_wifi_names_configured">Імена мереж Wi-Fi не налаштовано для цього тунелю</string>
+    <string name="general">Загальне</string>
+    <string name="auto_tun_off">Призупинити авто-тунель</string>
+    <string name="auto_off">Призупинити авто-тунель</string>
+    <string name="auto_tun_on">Відновити авто-тунель</string>
+    <string name="userspace">Користувача</string>
+    <string name="support">Підтримка</string>
+    <string name="settings">Налаштування</string>
+    <string name="use_amnezia">"Використовувати модуль Amnezia режиму користувача "</string>
+    <string name="backend">Модуль</string>
+    <string name="kernel">Модуль ядра</string>
+    <string name="junk_packet_count">Кількість «сміттєвих» пакетів</string>
+    <string name="junk_packet_minimum_size">Мінімальний розмір «сміттєвого» пакету</string>
+    <string name="junk_packet_maximum_size">Максимальний розмір «сміттєвого» пакету</string>
+    <string name="init_packet_junk_size">Початковий розмір «сміттєвого» пакету</string>
+    <string name="response_packet_junk_size">Розмір відповіді «сміттєвого» пакету</string>
+    <string name="init_packet_magic_header">Заголовок пакету ініціалізації</string>
+    <string name="underload_packet_magic_header">Заголовок пакету під навантаженням</string>
+    <string name="response_packet_magic_header">Заголовок пакету відповіді</string>
+    <string name="unsure_how">, якщо не впевнені що робити далі</string>
+    <string name="see_the">Дивіться</string>
+</resources>
@@ -58,8 +58,6 @@
    <string name="always_on_vpn_support">Allow Always-On VPN </string>
    <string name="location_services_not_detected">Location Services Not Detected</string>
    <string name="hint_search_packages">Search packages</string>
-    <string name="clear_icon">Clear Icon</string>
-    <string name="search_icon">Search Icon</string>
    <string name="attempt_connection">Attempting connection..</string>
    <string name="vpn_starting">VPN starting</string>
    <string name="db_name">wg-tunnel-db</string>
@@ -94,6 +92,7 @@
    <string name="error_authorization_failed">Failed to authorize</string>
    <string name="enabled_app_shortcuts">Enable app shortcuts</string>
    <string name="export_configs">Export configs</string>
+    <string name="export_configs_failed">Failed to export configs</string>
    <string name="location_services_required">Location services required</string>
    <string name="background_location_required">Background location required</string>
    <string name="precise_location_required">Precise location required</string>
@@ -173,5 +172,9 @@
    <string name="unsure_how">if you are unsure how to proceed</string>
    <string name="see_the">See the</string>
    <string name="getting_started_url" translatable="false">https://zaneschepke.com/wgtunnel-docs/getting-started.html</string>
-    <string name="getting_started_guide">Getting started guide</string>
+    <string name="getting_started_guide">getting started guide</string>
+    <string name="amnezia" translatable="false">Amnezia</string>
+    <string name="wireguard" translatable="false">WireGuard</string>
+    <string name="error_file_format">Invalid tunnel config format</string>
+    <string name="restart_at_boot">Restart on boot</string>
 </resources>
@@ -4,4 +4,12 @@
    <style name="Theme.WireguardAutoTunnel" parent="@style/Theme.AppCompat.NoActionBar">
        <item name="android:windowBackground">@color/black_background</item>
    </style>
-</resources>
+
+    <style name="Theme.AppSplashScreen" parent="Theme.SplashScreen">
+        <!--<item name="windowSplashScreenBackground">@color/white</item>-->
+        <!-- icon has to be a circle -->
+        <item name="windowSplashScreenAnimatedIcon">@mipmap/ic_launcher</item>
+        <item name="windowSplashScreenAnimationDuration">500</item>
+        <item name="postSplashScreenTheme">@style/Theme.WireguardAutoTunnel</item>
+    </style>
+</resources>
@@ -5,4 +5,5 @@ plugins {
    alias(libs.plugins.kotlinxSerialization) apply false
    alias(libs.plugins.ksp) apply false
    alias(libs.plugins.androidLibrary) apply false
+    alias(libs.plugins.compose.compiler) apply false
 }
@@ -1,47 +0,0 @@
-import org.gradle.api.invocation.Gradle
-import java.io.File
-
-object BuildHelper {
-    private fun getCurrentFlavor(gradle: Gradle): String {
-        val taskRequestsStr = gradle.startParameter.taskRequests.toString()
-        val pattern: java.util.regex.Pattern =
-            if (taskRequestsStr.contains("assemble")) {
-                java.util.regex.Pattern.compile("assemble(\\w+)(Release|Debug)")
-            } else {
-                java.util.regex.Pattern.compile("bundle(\\w+)(Release|Debug)")
-            }
-
-        val matcher = pattern.matcher(taskRequestsStr)
-        val flavor =
-            if (matcher.find()) {
-                matcher.group(1).lowercase()
-            } else {
-                print("NO FLAVOR FOUND")
-                ""
-            }
-        return flavor
-    }
-
-    fun getLocalProperty(key: String, file: String = "local.properties"): String? {
-        val properties = java.util.Properties()
-        val localProperties = File(file)
-        if (localProperties.isFile) {
-            java.io.InputStreamReader(java.io.FileInputStream(localProperties), Charsets.UTF_8)
-                .use { reader ->
-                    properties.load(reader)
-                }
-        } else return null
-        return properties.getProperty(key)
-    }
-
-    fun isGeneralFlavor(gradle: Gradle): Boolean {
-        return getCurrentFlavor(gradle) == "general"
-    }
-
-    fun isReleaseBuild(gradle: Gradle): Boolean {
-        return (gradle.startParameter.taskNames.size > 0 &&
-            gradle.startParameter.taskNames[0].contains(
-                "Release",
-            ))
-    }
-}
@@ -1,13 +1,11 @@
 object Constants {
-    const val VERSION_NAME = "3.4.3-beta"
+    const val VERSION_NAME = "3.4.8"
    const val JVM_TARGET = "17"
-    const val VERSION_CODE = 34202
+    const val VERSION_CODE = 34800
    const val TARGET_SDK = 34
    const val MIN_SDK = 26
    const val APP_ID = "com.zaneschepke.wireguardautotunnel"
    const val APP_NAME = "wgtunnel"
-    const val COMPOSE_COMPILER_EXTENSION_VERSION = "1.5.11"
-

    const val STORE_PASS_VAR = "SIGNING_STORE_PASSWORD"
    const val KEY_ALIAS_VAR = "SIGNING_KEY_ALIAS"
@@ -15,5 +13,8 @@ object Constants {
    const val KEY_STORE_PATH_VAR = "KEY_STORE_PATH"

    const val RELEASE = "release"
+    const val DEBUG = "debug"
    const val TYPE = "type"
+
+    const val NIGHTLY_CODE = 42
 }
@@ -0,0 +1,89 @@
+import org.gradle.api.Project
+import org.gradle.api.invocation.Gradle
+import java.io.File
+import java.util.Properties
+
+private fun getCurrentFlavor(gradle: Gradle): String {
+    val taskRequestsStr = gradle.startParameter.taskRequests.toString()
+    val pattern: java.util.regex.Pattern =
+        if (taskRequestsStr.contains("assemble")) {
+            java.util.regex.Pattern.compile("assemble(\\w+)(Release|Debug)")
+        } else {
+            java.util.regex.Pattern.compile("bundle(\\w+)(Release|Debug)")
+        }
+
+    val matcher = pattern.matcher(taskRequestsStr)
+    val flavor =
+        if (matcher.find()) {
+            matcher.group(1).lowercase()
+        } else {
+            print("NO FLAVOR FOUND")
+            ""
+        }
+    return flavor
+}
+
+fun getLocalProperty(key: String, file: String = "local.properties"): String? {
+    val properties = java.util.Properties()
+    val localProperties = File(file)
+    if (localProperties.isFile) {
+        java.io.InputStreamReader(java.io.FileInputStream(localProperties), Charsets.UTF_8)
+            .use { reader ->
+                properties.load(reader)
+            }
+    } else return null
+    return properties.getProperty(key)
+}
+
+fun Project.isGeneralFlavor(gradle: Gradle): Boolean {
+    return getCurrentFlavor(gradle) == "general"
+}
+
+fun Project.isReleaseBuild(): Boolean {
+    return (gradle.startParameter.taskNames.size > 0 &&
+        gradle.startParameter.taskNames[0].contains(
+            "Release",
+        ))
+}
+
+fun Project.isNightlyBuild(): Boolean {
+    return gradle.startParameter.taskNames.contains("assembleFdroidNightly")
+}
+
+fun Project.getSigningProperties() : Properties {
+    return Properties().apply {
+        // created local file for signing details
+        try {
+            load(file("signing.properties").reader())
+        } catch (_: Exception) {
+            load(file("signing_template.properties").reader())
+        }
+    }
+}
+
+fun Project.getStoreFile() : File {
+    return file(
+        System.getenv()
+            .getOrDefault(
+                Constants.KEY_STORE_PATH_VAR,
+                getSigningProperties().getProperty(Constants.KEY_STORE_PATH_VAR),
+            ),
+    )
+}
+
+fun Project.getSigningProperty(property: String) : String {
+    // try to get secrets from env first for pipeline build, then properties file for local
+    return System.getenv()
+        .getOrDefault(
+            property,
+            getSigningProperties().getProperty(property),
+        )
+}
+
+fun Project.signingConfigName() : String {
+    return if(getSigningProperty(Constants.KEY_PASS_VAR) == "") Constants.DEBUG else Constants.RELEASE
+}
+
+
+
+
@@ -0,0 +1,14 @@
+Funkce
+
+- Přidání tunelů pomocí .conf souboru, zipu, ručního zadávání nebo QR kódu
+- Automatické připojení k VPN dle Wi-Fi SSID, ethernetu či mobilních dat
+- Rozdělené tunelování dle aplikací s vyhledáváním
+- WireGuard podpora pro kernel a userspace módy
+- Amnezia podpora pro userspace mód pro ochranu před cenzurou
+- Always-On VPN podpora
+- Exportování Amnezia a WireGuard tunelů do zipu
+- Podpora pro přepínání VPN pomocí rychlých dlaždic
+- Podpora statických zkratek u hlavního tunelu pro automatickou integraci
+- Podpora Intent automatizace pro všechny tunely
+- Automatický restart služby po restartu systému
+- Opatření pro úsporu baterie
@@ -0,0 +1 @@
+Alternativní VPN klientská aplikace pro WireGuard s přidanými funkcemi
@@ -1,5 +1,5 @@
 Verbesserungen:
- Unterstützung für Tunnelung nur bei Verwendung von Mobilen Daten
+- Unterstützung für Auto-Tunneln nur bei Verwendung von Mobilen Daten
 - Verbesserungen der Support Oberfläche
 - Aktualisierung der Ressourcenlinks
 - Verschiedene andere Fehlerbehebungen
@@ -0,0 +1,3 @@
+Was ist neu:
+- Amnezia seite-zu-seite mit WireGuard hinzugefügt 
+- App Shortcut Bug behoben
@@ -0,0 +1,6 @@
+Was ist neu:
+- Offizielle Unterstützung für AmneziaWG
+- Import/Export von Amnezia Konfigurationen
+- Auto-Tunnel, um nur einmal pro Netzwerkänderung umzuschalten
+- Unterstützung für zusätzliche Sprachen
+- Weitere Fehlerbehebungen und Verbesserungen
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Zane Schepke	431b2f9061	fix: nightly grep	2024-07-27 07:59:55 -04:00
Zane Schepke	f822292584	fix: nightly check	2024-07-27 07:54:52 -04:00
Zane Schepke	4ffc5d4069	fix: play deploy job	2024-07-27 07:42:02 -04:00
Zane Schepke	680fbed28c	fix: nightly detection	2024-07-27 07:37:47 -04:00
Zane Schepke	737524831b	fix: auto tunnel tile bug Fixes bug where auto tunnel tile was the opposite state Closes #241	2024-07-27 07:21:27 -04:00
Zane Schepke	b8c36ac192	fix: notification pin lock bypass Closes #242	2024-07-27 06:44:02 -04:00
Zane Schepke	547686069f	fix: androidtv multiple tunnel control Fixes a bug where androidTV was only allowing control of a single tunnel. Closes #268	2024-07-27 06:04:25 -04:00
Zane Schepke	ac18ac8274	fix: cd upload bug	2024-07-27 04:53:16 -04:00
Zane Schepke	cb983da990	fix: cd apk upload	2024-07-27 04:42:21 -04:00
Zane Schepke	cfe64dcb61	fix: cd fdroid dispatch bug	2024-07-27 04:24:26 -04:00
Zane Schepke	2db521d510	fix: add missing cd deps	2024-07-27 04:20:35 -04:00
Zane Schepke	ff6c763b7b	fix: cd typo	2024-07-27 04:18:04 -04:00
Zane Schepke	ebf7521fa1	cd: improve release workflow w/nightly	2024-07-27 04:15:57 -04:00
Zane Schepke	7a2d96fcd7	fix: remove portrait lock bump deps Closes #259 Closes #227 Closes #226 Closes #219 Closes #218	2024-07-27 02:20:01 -04:00
𝗪𝗜𝗡𝗭𝗢𝗥𝗧	c6c8047982	update-tr-locales (#255 )	2024-07-11 01:00:40 -04:00
dependabot[bot]	9cfb7250de	build(deps): bump actions/upload-artifact from 4.3.3 to 4.3.4 (#257 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2024-07-11 00:21:25 -04:00
Zane Schepke	79b5b039b0	fix: crashing and pin lock Re-enabled pin lock after disablement from crashes. Fixed crashing issues. Closes #237 Fixed bug where pin lock will no longer initialize if never not enabled/in use. Improved tunnel control tile performance. Fix bad address crash when user enters bad addresses into allowedIps. Closes #229 Disabled auto rotate Closes #212 Add restart on boot toggle to make restart of services feature more obvious and configurable.	2024-06-18 23:08:40 -04:00
Weblate (bot)	29616f8325	Translations update from Hosted Weblate (#228 ) Co-authored-by: gallegonovato <fran-carro@hotmail.es> Co-authored-by: Kirill Isakov <k@isakov.net> Co-authored-by: Roman Nahálka <nahalkaroman@gmail.com> Co-authored-by: Languages add-on <noreply-addon-languages@weblate.org> Co-authored-by: Luiz Fellipe Carneiro <fellipec@outlook.com> Co-authored-by: Kachelkaiser <kachelkaiser@outlook.com> Co-authored-by: yura04 <yura.panasiuk04@gmail.com>	2024-06-18 19:13:41 -04:00
Zane Schepke	8bbe81d294	fix: disable pin lock	2024-06-01 06:00:27 -04:00
Zane Schepke	571fb1b12c	chore: add missing title for cz	2024-06-01 03:05:04 -04:00
Zane Schepke	02f6f97aa1	docs: update readme	2024-06-01 03:00:41 -04:00
Zane Schepke	1d74d0984e	fix: auto tunneling and backup Fixes a bug where android backups can cause app crashes due to pin lock feature keystore. Fixes a bug where auto tunneling to SSID tunnel was not working correctly. Fixes a mobile data tunneling bug which was causing mobile data tunneling to not perform correctly. Additional strictmode improvements.	2024-06-01 02:37:32 -04:00
Zane Schepke	6448386f76	update gradle checksum	2024-05-31 00:02:41 -04:00
Zane Schepke	d09e85ba45	remove unneeded strings	2024-05-30 23:29:09 -04:00
Zane Schepke	a9bc1cc7f0	Merge remote-tracking branch 'weblate/main'	2024-05-30 23:15:58 -04:00
Zane Schepke	54d9653f04	fix: mobile data tunneling Fixes a bug where mobile data tunneling was not working properly in certain scenarios. Fixes an issue where the new floating action button was not working correctly on AndroidTV. Improved local logging. Additional refactors and optimizations.	2024-05-30 23:10:28 -04:00
Eryk Michalak	efc66821a6	Translated using Weblate (Polish) Currently translated at 6.1% (11 of 179 strings) Translation: WG Tunnel/strings Translate-URL: https://hosted.weblate.org/projects/wg-tunnel/strings/pl/	2024-05-24 15:09:16 +00:00
Kachelkaiser	3af7adc45b	Translated using Weblate (German) Currently translated at 100.0% (179 of 179 strings) Translation: WG Tunnel/strings Translate-URL: https://hosted.weblate.org/projects/wg-tunnel/strings/de/	2024-05-24 15:09:15 +00:00
Kachelkaiser	5754f2183c	Translated using Weblate (German) Currently translated at 100.0% (25 of 25 strings) Translation: WG Tunnel/fastlane Translate-URL: https://hosted.weblate.org/projects/wg-tunnel/fastlane/de/	2024-05-24 15:09:14 +00:00
Kirill Isakov	f7f7f1bd9d	Translated using Weblate (Russian) Currently translated at 100.0% (179 of 179 strings) Translation: WG Tunnel/strings Translate-URL: https://hosted.weblate.org/projects/wg-tunnel/strings/ru/	2024-05-24 15:09:12 +00:00
Weblate (bot)	57bb3f5e74	Translations update from Hosted Weblate (#216 ) Co-authored-by: Languages add-on <noreply-addon-languages@weblate.org> Co-authored-by: er2de2 <romandrajer@gmail.com> Co-authored-by: Kirill Isakov <k@isakov.net> Co-authored-by: Kachelkaiser <kachelkaiser@outlook.com> Co-authored-by: Golbinex <baksa@protonmail.com>	2024-05-24 00:16:32 -04:00
Hosted Weblate	49196e7c7b	Update translation files Updated by "Remove blank strings" hook in Weblate. Translation: WG Tunnel/strings Translate-URL: https://hosted.weblate.org/projects/wg-tunnel/strings/	2024-05-23 16:52:57 +02:00
Golbinex	894b63e668	Translated using Weblate (Czech) Currently translated at 86.5% (155 of 179 strings) Translation: WG Tunnel/strings Translate-URL: https://hosted.weblate.org/projects/wg-tunnel/strings/cs/	2024-05-23 16:52:57 +02:00
Golbinex	e16d44ff20	Translated using Weblate (Czech) Currently translated at 8.0% (2 of 25 strings) Translation: WG Tunnel/fastlane Translate-URL: https://hosted.weblate.org/projects/wg-tunnel/fastlane/cs/	2024-05-23 16:52:57 +02:00
Kachelkaiser	b8b3f3001b	Translated using Weblate (German) Currently translated at 98.8% (177 of 179 strings) Translation: WG Tunnel/strings Translate-URL: https://hosted.weblate.org/projects/wg-tunnel/strings/de/	2024-05-23 16:52:57 +02:00
Kirill Isakov	d142ecea6e	Translated using Weblate (Russian) Currently translated at 100.0% (179 of 179 strings) Translation: WG Tunnel/strings Translate-URL: https://hosted.weblate.org/projects/wg-tunnel/strings/ru/	2024-05-23 16:52:57 +02:00
Kirill Isakov	b793984ede	Translated using Weblate (Russian) Currently translated at 100.0% (25 of 25 strings) Translation: WG Tunnel/fastlane Translate-URL: https://hosted.weblate.org/projects/wg-tunnel/fastlane/ru/	2024-05-23 16:52:56 +02:00
Languages add-on	ae2532afe5	Added translation using Weblate (Czech)	2024-05-23 10:20:34 +02:00
er2de2	2720a3b35e	Translated using Weblate (Polish) Currently translated at 12.0% (3 of 25 strings) Translation: WG Tunnel/fastlane Translate-URL: https://hosted.weblate.org/projects/wg-tunnel/fastlane/pl/	2024-05-22 19:45:01 +02:00
Languages add-on	2350364543	Added translation using Weblate (Polish)	2024-05-22 06:08:54 +02:00
Languages add-on	f4172cb1fc	Added translation using Weblate (Hungarian)	2024-05-15 22:45:19 +02:00
Weblate (bot)	90c482ae4f	Translations update from Hosted Weblate (#214 ) Co-authored-by: Rainer <ram002@web.de> Co-authored-by: Philip <philip.web@directbox.com>	2024-05-14 18:52:56 -04:00
Weblate (bot)	1eb8ad62e0	Translations update from Hosted Weblate (#210 )	2024-05-12 15:14:05 -04:00
Zane Schepke	d44baa84a8	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.	2024-05-11 20:42:24 -04:00
Zane Schepke	cb1b8ee7d6	add version metadata	2024-05-11 00:18:58 -04:00
Zane Schepke	4153351fc4	Merge branch 'main' of https://github.com/zaneschepke/wgtunnel	2024-05-10 23:52:43 -04:00
dependabot[bot]	48e6f341cb	build(deps): bump actions/upload-artifact from 4.3.1 to 4.3.3 (#179 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2024-05-10 23:52:03 -04:00
Zane Schepke	d531adede5	remove comments	2024-05-10 23:49:38 -04:00
Zane Schepke	2df1bb07ab	change auto tunnel to not watch vpn state	2024-05-10 23:46:50 -04:00
Zane Schepke	a5e60c3fbe	add amnezia import/export	2024-05-10 21:42:59 -04:00
Weblate (bot)	e4af481402	Translations update from Hosted Weblate (#206 ) Co-authored-by: gallegonovato <fran-carro@hotmail.es>	2024-05-10 12:34:10 -04:00
Weblate (bot)	77b3fc8360	Translations update from Hosted Weblate (#204 ) Co-authored-by: gallegonovato <fran-carro@hotmail.es>	2024-05-09 15:26:47 -04:00
Zane Schepke	4fd908f271	fix: notification workflow links	2024-05-08 17:30:00 -04:00
maskedeken	632da245ab	fix kernel mode switch not work (#196 )	2024-05-08 17:25:28 -04:00
Weblate (bot)	04f22cb92d	Translations update from Hosted Weblate (#200 ) Co-authored-by: Gabriel Franz <gabrielfranz31@gmail.com>	2024-05-08 13:13:58 -04:00
Weblate (bot)	31194d8b88	Translations update from Hosted Weblate (#194 ) Co-authored-by: Mat1RX <ladved@gmail.com>	2024-05-05 21:39:09 -04:00
Zane Schepke	421bf418d1	fix: fastlane metadata	2024-05-05 21:36:44 -04:00
				`@@ -0,0 +1 @@`
				`Alternativní VPN klientská aplikace pro WireGuard s přidanými funkcemi`