Translated using Weblate (Italian)

Currently translated at 78.2% (368 of 470 strings)

Translation: WG Tunnel/strings
Translate-URL: https://hosted.weblate.org/projects/wg-tunnel/strings/it/

.github/workflows/build-aab.yml

@@ -70,16 +70,16 @@ jobs:
     outputs:
       UPLOAD_DIR_ANDROID: ${{ env.UPLOAD_DIR_ANDROID }}
     steps:
-      - uses: actions/checkout@v7
+      - uses: actions/checkout@v6
         with:
           fetch-depth: 0
           submodules: recursive
 
-      - name: Set up JDK 21
+      - name: Set up JDK 17
         uses: actions/setup-java@v5
         with:
           distribution: 'temurin'
-          java-version: '21'
+          java-version: '17'
           cache: gradle
 
       - name: Grant execute permission for gradlew

.github/workflows/build.yml

@@ -72,15 +72,15 @@ jobs:
     outputs:
       UPLOAD_DIR_ANDROID: ${{ env.UPLOAD_DIR_ANDROID }}
     steps:
-      - uses: actions/checkout@v7
+      - uses: actions/checkout@v6
         with:
           fetch-depth: 0
           submodules: recursive
-      - name: Set up JDK 21
+      - name: Set up JDK 17
         uses: actions/setup-java@v5
         with:
           distribution: 'temurin'
-          java-version: '21'
+          java-version: '17'
           cache: gradle
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
@@ -112,9 +112,6 @@ jobs:
               ./gradlew :app:assemble${flavor^}Debug --stacktrace
               ;;
           esac
-        env:
-          GITHUB_SHA: ${{ github.sha }}
-          GITHUB_RUN_NUMBER: ${{ github.run_number }}
       - name: Get release apk path
         id: apk-path
         run: echo "path=$(find . -regex '^.*/build/outputs/apk/${{ inputs.flavor }}/${{ inputs.build_type }}/.*\.apk$' -type f | head -1 | tail -c+2)" >> $GITHUB_OUTPUT

.github/workflows/nightly.yml

@@ -16,7 +16,7 @@ jobs:
       has_new_commits: ${{ steps.check.outputs.new_commits }}
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v7
+        uses: actions/checkout@v6
       - name: Check for new commits
         id: check
         env:
@@ -43,7 +43,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
 
-      - uses: actions/checkout@v7
+      - uses: actions/checkout@v6
         with:
           submodules: recursive
 

.github/workflows/pr.yml

@@ -1,30 +1,25 @@
 name: on-pr
-
 permissions:
   contents: read
 
 on:
-  workflow_dispatch:
-  pull_request:
+    workflow_dispatch:
+    pull_request:
 
 jobs:
   format_check:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v7
-
-      - name: Verify Gradle Wrapper
-        uses: gradle/actions/wrapper-validation@v6
-
-      - name: Set up JDK 21
+      - uses: actions/checkout@v6
+      - name: Set up JDK 17
         uses: actions/setup-java@v5
         with:
           distribution: 'temurin'
-          java-version: '21'
+          java-version: '17'
           cache: gradle
 
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
 
       - name: Run ktfmt
-        run: ./gradlew ktfmtCheck
+        run: ./gradlew ktfmtCheck

.github/workflows/publish.yml

@@ -78,7 +78,7 @@ jobs:
     name: publish-github
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v7
+      - uses: actions/checkout@v6
         with:
           ref: ${{ github.event_name == 'push' && github.ref || 'master' }}
       - name: Install system dependencies
@@ -187,61 +187,57 @@ jobs:
           repository: wgtunnel/fdroid
           event-type: fdroid-update
 
-  build-google-aab:
-    if: >-
-      ${{
-        github.event_name == 'push' ||
-        inputs.track != 'none'
-      }}
-    uses: ./.github/workflows/build-aab.yml
-    secrets: inherit
-    with:
-      build_type: release
-      flavor: google
-
   publish-play:
     if: ${{ github.event_name == 'push' || inputs.track != 'none' }}
     name: Publish to Google Play
     runs-on: ubuntu-latest
-    needs: build-google-aab
+
+    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/
+
     steps:
-      - uses: actions/checkout@v7
+      - uses: actions/checkout@v6
+      - name: Set up JDK 17
+        uses: actions/setup-java@v5
         with:
-          ref: ${{ github.event_name == 'push' && github.ref || 'master' }}
+          distribution: 'temurin'
+          java-version: '17'
+          cache: gradle
 
-      - name: Download AAB artifact
-        uses: actions/download-artifact@v8
+      - 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@v2.0
         with:
-          name: google-play-aab
-          path: ${{ github.workspace }}/aab
+          fileName: ${{ env.KEY_STORE_FILE }}
+          fileDir: ${{ env.KEY_STORE_LOCATION }}
+          encodedString: ${{ secrets.KEYSTORE }}
 
-      - name: Find exact AAB file path
-        id: find-aab
+      # create keystore path for gradle to read
+      - name: Create keystore path env var
         run: |
-          AAB_PATH=$(find "${{ github.workspace }}/aab" -name "*.aab" -type f | head -1)
-          if [ -z "$AAB_PATH" ]; then
-            echo "ERROR: No .aab file found after download!"
-            find "${{ github.workspace }}/aab" -type f
-            exit 1
-          fi
-          echo "Found AAB: $AAB_PATH"
-          echo "aab_path=$AAB_PATH" >> $GITHUB_OUTPUT
+          store_path=${{ env.KEY_STORE_LOCATION }}${{ env.KEY_STORE_FILE }}
+          echo "KEY_STORE_PATH=$store_path" >> $GITHUB_ENV
 
       - name: Create service_account.json
+        id: createServiceAccount
         run: echo '${{ secrets.SERVICE_ACCOUNT_JSON }}' > service_account.json
 
-      - name: Set up Ruby
+      - name: Deploy with fastlane
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '3.4'
+          ruby-version: '3.2' # Not needed with a .ruby-version file
           bundler-cache: true
 
-      - name: Upload to Google Play
+      - name: Distribute app to Prod track 🚀
         run: |
           track=${{ github.event_name == 'push' && 'production' || inputs.track }}
-          bundle exec fastlane run upload_to_play_store \
-            track:"$track" \
-            aab:"${{ steps.find-aab.outputs.aab_path }}" \
-            json_key:"service_account.json" \
-            package_name:"com.zaneschepke.wireguardautotunnel" \
-            skip_upload_apk:true
+          (cd ${{ github.workspace }} && bundle install && bundle exec fastlane $track --verbose)

Gemfile

@@ -1,4 +1,3 @@
 source "https://rubygems.org"
 
-gem "fastlane"
-gem "multi_json"
+gem "fastlane"

README.md

@@ -49,8 +49,8 @@ and [AmneziaWG](https://docs.amnezia.org/documentation/amnezia-wg/)
 
 ## About
 
-WG Tunnel is an alternative Android client for WireGuard and AmneziaWG, inspired by the official WireGuard Android app. It fills gaps in the official client by adding advanced features like auto-tunneling, AmneziaWG support, different app modes like **Lockdown** (a custom kill switch for leak prevention), and **Local Proxy** (expose a tunnel over a local SOCKS5/HTTP proxy server) for enhanced privacy, censorship resistance, and flexibility.
- 
+WG Tunnel is an alternative Android client for WireGuard and AmneziaWG, inspired by the official WireGuard Android app. It fills gaps in the official client by adding advanced features like auto-tunneling (on-demand VPN activation), while seamlessly supporting both protocols across app modes—including Kernel (for direct WireGuard kernel integration; AmneziaWG not supported), VPN (standard system-level tunneling), Lockdown (a custom kill switch for leak prevention), and Proxy (built-in HTTP/SOCKS5 forwarding)—for enhanced privacy, censorship resistance, and flexibility.
+
 </div>
 
 <div style="text-align: left;">
@@ -67,18 +67,21 @@ WG Tunnel is an alternative Android client for WireGuard and AmneziaWG, inspired
 
 ## Features
 
-- **Auto-Tunneling:** Automatically activate tunnels based on your device's active network details.
-- **Deferred Endpoint Bootstrapping:** Safely resolves endpoints and updates peers after the tunnel is up for better reliability and leak protection on startup.
-- **Handshake Monitoring:** Real-time handshake monitoring for instant tunnel health feedback.
-- **AmneziaWG Support:** Full support for AmneziaWG 2.0, providing robust censorship protection.
-- **Split Tunneling:** Flexible support for routing specific apps or traffic through the VPN.
-- **Local Proxy Mode:** Expose WireGuard tunnels over a local SOCKS5 or HTTP proxy to browsers or firewall apps (like AdGuard).
-- **Lockdown Mode:** Advanced in-app kill switch that blocks all traffic while the tunnel is down.
-- **Quick Controls:** Quick Settings tile and home screen shortcuts for easy toggling.
-- **Remote Control Support:** Intent-based automation for controlling tunnels and auto-tunneling from automation apps (like Tasker).
-- **Dynamic DNS Handling:** Automatically detect and update endpoints on server IP changes without requiring a restart.
-- **IPv6 Endpoints:** Automatically upgrade to IPv6 endpoints or fall back to IPv4 based on network conditions without requiring a restart.
-- **Android TV Support:** Full support for nearly all features on Android TV.
+- **Tunnel Import Methods**: Easily add tunnels using .conf files, ZIP archives, manual entry, or QR code scanning.
+- **Auto-Tunneling**: Automatically activate tunnels based on Wi-Fi SSID, Ethernet connections, or mobile data networks.
+- **Split Tunneling**: Flexible support for routing specific apps or traffic through the VPN.
+- **WireGuard Modes**: Full compatibility with WireGuard in both kernel and userspace implementations.
+- **AmneziaWG Integration**: Userspace mode for AmneziaWG, providing robust censorship evasion.
+- **Always-On VPN**: Ensures continuous protection with Android's Always-On VPN feature.
+- **Quick Controls**: Quick Settings tile and home screen shortcuts for easy VPN toggling.
+- **Automation Support**: Intent-based automation for controlling tunnels.
+- **Auto-Restore**: Seamlessly restores auto-tunneling and active tunnels after device restarts or app updates.
+- **Proxying Options**: Built-in HTTP and SOCKS5 proxy support within tunnels.
+- **Lockdown Mode**: Custom kill switch for maximum leak prevention and security.
+- **Dynamic DNS Handling**: Detects and updates DNS changes without tunnel restarts.
+- **Monitoring Tools**: Advanced tunnel monitoring features for tunnel performance monitoring.
+- **Android TV Support**: Android TV support for secure streaming and browsing.
+- **Advanced DNS**: DNS over HTTPS support for tunnel endpoint resolutions.
 
 ## Building
 

app/build.gradle.kts

@@ -1,5 +1,6 @@
 import com.android.build.api.dsl.ApplicationExtension
 import com.android.build.api.variant.FilterConfiguration
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     alias(libs.plugins.android.application)
@@ -22,6 +23,13 @@ licensee {
     ignoreDependencies("com.github.topjohnwu.libsu")
 }
 
+kotlin {
+    compilerOptions {
+        jvmTarget = JvmTarget.JVM_17
+        freeCompilerArgs = listOf("-XXLanguage:+PropertyParamAnnotationDefaultTargetMode")
+    }
+}
+
 configure<ApplicationExtension> {
     namespace = Constants.APP_ID
     compileSdk = Constants.TARGET_SDK
@@ -38,11 +46,10 @@ configure<ApplicationExtension> {
 
     splits {
         abi {
-            val noSplits = providers.gradleProperty("noSplits").isPresent
-            isEnable = !noSplits
+            isEnable = !project.hasProperty("noSplits")
             reset()
             include("armeabi-v7a", "arm64-v8a")
-            isUniversalApk = !noSplits
+            isUniversalApk = !project.hasProperty("noSplits")
         }
     }
 
@@ -50,17 +57,14 @@ configure<ApplicationExtension> {
         applicationId = Constants.APP_ID
         minSdk = Constants.MIN_SDK
         targetSdk = Constants.TARGET_SDK
-        versionCode = Constants.VERSION_CODE
-        versionName = Constants.VERSION_NAME
-
-        experimentalProperties["android.experimental.disableGitVersion"] = true
+        versionCode = computeVersionCode()
+        versionName = computeVersionName()
 
         sourceSets {
             getByName("debug").assets.directories += "$projectDir/schemas"
         }
 
-        val languagesProvider = project.languageListProvider()
-        val languagesArray = buildLanguagesArray(languagesProvider.get())
+        val languagesArray = buildLanguagesArray(languageList())
         buildConfigField("String[]", "LANGUAGES", "new String[]{ $languagesArray }")
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
@@ -130,6 +134,8 @@ configure<ApplicationExtension> {
 
     compileOptions {
         isCoreLibraryDesugaringEnabled = true
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
 
     buildFeatures {
@@ -142,42 +148,31 @@ configure<ApplicationExtension> {
 
 androidComponents {
     onVariants { variant ->
-        val isNightly = project.isNightlyBuild()
 
-        if (isNightly) {
-            variant.outputs.forEach { output ->
-
-                output.versionCode.set(
-                    output.versionCode.get() + project.getVersionCodeIncrement()
-                )
-
-                val currentVersion = output.versionName.get()
-                val nextVersion = bumpToNextPatchVersion(currentVersion)
-                val gitHash = project.getGitCommitHash()
-
-                output.versionName.set("$nextVersion-nightly+git.$gitHash")
-            }
-        }
-
-        val abiNameMap = mapOf(
-            "armeabi-v7a" to "armv7",
-            "arm64-v8a" to "arm64",
-            "x86" to "x86",
-            "x86_64" to "x64",
-        )
+        val abiNameMap =
+            mapOf(
+                "armeabi-v7a" to "armv7",
+                "arm64-v8a" to "arm64",
+                "x86" to "x86",
+                "x86_64" to "x64",
+            )
 
         variant.outputs.forEach { output ->
             val abi = output.filters.find { it.filterType == FilterConfiguration.FilterType.ABI }?.identifier
+
             val flavorName = variant.productFlavors.joinToString("-") { it.second }
+
             val versionName = output.versionName.get()
+
             val baseFileName = "${Constants.APP_NAME}-${flavorName}-v${versionName}"
 
-            val outputFileName = if (!abi.isNullOrEmpty()) {
-                val shortAbiName = abiNameMap.getOrDefault(abi, abi)
-                "${baseFileName}-${shortAbiName}.apk"
-            } else {
-                "${baseFileName}.apk"
-            }
+            val outputFileName =
+                if (!abi.isNullOrEmpty()) {
+                    val shortAbiName = abiNameMap.getOrDefault(abi, abi)
+                    "${baseFileName}-${shortAbiName}.apk"
+                } else {
+                    "${baseFileName}.apk"
+                }
 
             output.outputFileName.set(outputFileName)
         }
@@ -230,7 +225,6 @@ dependencies {
     // UI utilities
     implementation(libs.bundles.ui.utilities)
     implementation(libs.lottie.compose)
-    implementation(libs.sonner)
 
     // Misc utilities
     implementation(libs.bundles.misc.utilities)

app/src/main/AndroidManifest.xml

@@ -169,7 +169,7 @@
                 tools:node="remove" />
         </provider>
         <service
-            android:name=".service.tile.TunnelControlTile"
+            android:name=".core.service.tile.TunnelControlTile"
             android:exported="true"
             android:icon="@drawable/ic_notification"
             android:label="@string/tunnel_control"
@@ -186,7 +186,7 @@
             </intent-filter>
         </service>
         <service
-            android:name=".service.tile.AutoTunnelControlTile"
+            android:name=".core.service.tile.AutoTunnelControlTile"
             android:exported="true"
             android:icon="@drawable/ic_notification"
             android:label="@string/auto_tunnel"
@@ -203,7 +203,7 @@
             </intent-filter>
         </service>
         <service
-            android:name=".service.autotunnel.AutoTunnelService"
+            android:name=".core.service.autotunnel.AutoTunnelService"
             android:enabled="true"
             android:exported="false"
             android:foregroundServiceType="specialUse"

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

@@ -19,34 +19,17 @@ import androidx.compose.animation.fadeOut
 import androidx.compose.animation.slideInHorizontally
 import androidx.compose.animation.slideOutHorizontally
 import androidx.compose.animation.togetherWith
-import androidx.compose.foundation.BorderStroke
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.consumeWindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.outlined.CheckCircleOutline
-import androidx.compose.material.icons.outlined.Error
-import androidx.compose.material.icons.outlined.ErrorOutline
-import androidx.compose.material.icons.outlined.FavoriteBorder
-import androidx.compose.material.icons.outlined.Info
-import androidx.compose.material.icons.outlined.Warning
-import androidx.compose.material.icons.outlined.WarningAmber
-import androidx.compose.material.icons.rounded.Error
-import androidx.compose.material.icons.rounded.Info
-import androidx.compose.material.icons.rounded.Warning
-import androidx.compose.material3.ButtonDefaults
+import androidx.compose.foundation.layout.wrapContentHeight
 import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
-import androidx.compose.material3.Text
-import androidx.compose.material3.TextButton
 import androidx.compose.material3.surfaceColorAtElevation
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.LaunchedEffect
@@ -58,12 +41,15 @@ import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Brush
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.LinkAnnotation
+import androidx.compose.ui.text.SpanStyle
+import androidx.compose.ui.text.TextLinkStyles
+import androidx.compose.ui.text.buildAnnotatedString
 import androidx.compose.ui.text.intl.Locale
-import androidx.compose.ui.unit.IntOffset
+import androidx.compose.ui.text.style.TextDecoration
+import androidx.compose.ui.text.withLink
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.zIndex
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
@@ -73,10 +59,6 @@ import androidx.navigation3.runtime.entryProvider
 import androidx.navigation3.runtime.rememberNavBackStack
 import androidx.navigation3.runtime.rememberSaveableStateHolderNavEntryDecorator
 import androidx.navigation3.ui.NavDisplay
-import com.dokar.sonner.TextToastAction
-import com.dokar.sonner.ToastType
-import com.dokar.sonner.Toaster
-import com.dokar.sonner.rememberToasterState
 import com.zaneschepke.networkmonitor.NetworkMonitor
 import com.zaneschepke.wireguardautotunnel.data.AppDatabase
 import com.zaneschepke.wireguardautotunnel.domain.enums.TunnelMode
@@ -88,6 +70,10 @@ import com.zaneschepke.wireguardautotunnel.ui.LocalIsAndroidTV
 import com.zaneschepke.wireguardautotunnel.ui.LocalNavController
 import com.zaneschepke.wireguardautotunnel.ui.common.banner.AppAlertBanner
 import com.zaneschepke.wireguardautotunnel.ui.common.dialog.VpnDeniedDialog
+import com.zaneschepke.wireguardautotunnel.ui.common.snackbar.CustomSnackBar
+import com.zaneschepke.wireguardautotunnel.ui.common.snackbar.SnackbarInfo
+import com.zaneschepke.wireguardautotunnel.ui.common.snackbar.SnackbarType
+import com.zaneschepke.wireguardautotunnel.ui.common.snackbar.rememberCustomSnackbarState
 import com.zaneschepke.wireguardautotunnel.ui.navigation.Route
 import com.zaneschepke.wireguardautotunnel.ui.navigation.SecureRoute
 import com.zaneschepke.wireguardautotunnel.ui.navigation.Tab
@@ -124,28 +110,19 @@ import com.zaneschepke.wireguardautotunnel.ui.screens.tunnels.settings.ipv6.IPv6
 import com.zaneschepke.wireguardautotunnel.ui.screens.tunnels.sort.SortScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.tunnels.splittunnel.SplitTunnelScreen
 import com.zaneschepke.wireguardautotunnel.ui.theme.AlertRed
-import com.zaneschepke.wireguardautotunnel.ui.theme.Heart
 import com.zaneschepke.wireguardautotunnel.ui.theme.OffWhite
-import com.zaneschepke.wireguardautotunnel.ui.theme.SilverTree
-import com.zaneschepke.wireguardautotunnel.ui.theme.Straw
 import com.zaneschepke.wireguardautotunnel.ui.theme.WireguardAutoTunnelTheme
-import com.zaneschepke.wireguardautotunnel.util.FileUtils
 import com.zaneschepke.wireguardautotunnel.util.LocaleUtil
-import com.zaneschepke.wireguardautotunnel.util.StringValue
 import com.zaneschepke.wireguardautotunnel.util.extensions.installApk
 import com.zaneschepke.wireguardautotunnel.util.extensions.isRunningOnTv
 import com.zaneschepke.wireguardautotunnel.util.extensions.openWebUrl
 import com.zaneschepke.wireguardautotunnel.util.extensions.restartApp
+import com.zaneschepke.wireguardautotunnel.util.extensions.showToast
 import com.zaneschepke.wireguardautotunnel.viewmodel.ConfigEditViewModel
 import com.zaneschepke.wireguardautotunnel.viewmodel.SharedAppViewModel
 import com.zaneschepke.wireguardautotunnel.viewmodel.SplitTunnelViewModel
 import com.zaneschepke.wireguardautotunnel.viewmodel.TunnelViewModel
-import de.raphaelebner.roomdatabasebackup.core.OnCompleteListener.Companion.EXIT_CODE_ERROR
-import de.raphaelebner.roomdatabasebackup.core.OnCompleteListener.Companion.EXIT_CODE_ERROR_DECRYPTION_ERROR
-import de.raphaelebner.roomdatabasebackup.core.OnCompleteListener.Companion.EXIT_CODE_ERROR_RESTORE_BACKUP_IS_ENCRYPTED
-import de.raphaelebner.roomdatabasebackup.core.OnCompleteListener.Companion.EXIT_CODE_ERROR_WRONG_DECRYPTION_PASSWORD
 import de.raphaelebner.roomdatabasebackup.core.RoomBackup
-import kotlin.time.Duration.Companion.milliseconds
 import kotlinx.coroutines.awaitCancellation
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.collectLatest
@@ -155,7 +132,6 @@ import org.koin.androidx.compose.koinViewModel
 import org.koin.androidx.viewmodel.ext.android.viewModel
 import org.koin.core.parameter.parametersOf
 import org.orbitmvi.orbit.compose.collectAsState
-import timber.log.Timber
 import xyz.teamgravity.pin_lock_compose.PinManager
 
 class MainActivity : AppCompatActivity() {
@@ -179,10 +155,10 @@ class MainActivity : AppCompatActivity() {
         }
         super.onCreate(savedInstanceState)
 
-        roomBackup = RoomBackup(this).database(appDatabase).enableLogDebug(true).maxFileCount(5)
-
         handleIncomingIntent(intent)
 
+        roomBackup = RoomBackup(this)
+
         installSplashScreen().apply {
             setKeepOnScreenCondition { !viewModel.container.stateFlow.value.isAppLoaded }
         }
@@ -199,7 +175,7 @@ class MainActivity : AppCompatActivity() {
                 }
             }
 
-            val toaster = rememberToasterState()
+            val snackbarState = rememberCustomSnackbarState()
             var showVpnPermissionDialog by remember { mutableStateOf(false) }
             var vpnPermissionDenied by remember { mutableStateOf(false) }
             var requestingTunnelMode by remember {
@@ -256,19 +232,23 @@ class MainActivity : AppCompatActivity() {
                         }
 
                         is GlobalSideEffect.Snackbar -> {
-                            when (sideEffect.type) {
-                                ToastType.Warning,
-                                ToastType.Error -> toaster.dismissAll()
-                                else -> Unit
+                            scope.launch {
+                                snackbarState.showSnackbar(
+                                    SnackbarInfo(
+                                        message =
+                                            buildAnnotatedString {
+                                                append(sideEffect.message.asString(context))
+                                            },
+                                        type = sideEffect.type ?: SnackbarType.INFO,
+                                        durationMs = sideEffect.durationMs ?: 4000L,
+                                    )
+                                )
                             }
-
-                            toaster.show(
-                                message = sideEffect.message.asString(context),
-                                type = sideEffect.type,
-                                duration = (sideEffect.durationMs ?: 4000L).milliseconds,
-                            )
                         }
 
+                        is GlobalSideEffect.Toast ->
+                            scope.launch { context.showToast(sideEffect.message.asString(context)) }
+
                         is GlobalSideEffect.LaunchUrl -> context.openWebUrl(sideEffect.url)
                         is GlobalSideEffect.InstallApk -> context.installApk(sideEffect.apk)
                     }
@@ -295,26 +275,49 @@ class MainActivity : AppCompatActivity() {
                         },
                     )
 
+                    val annotatedMessage = buildAnnotatedString {
+                        append(context.getString(R.string.donation_prompt_prefix))
+                        append(" ")
+                        withLink(
+                            LinkAnnotation.Clickable(
+                                tag = context.getString(R.string.support),
+                                styles =
+                                    TextLinkStyles(
+                                        style =
+                                            SpanStyle(
+                                                textDecoration = TextDecoration.Underline,
+                                                color = MaterialTheme.colorScheme.primary,
+                                            ),
+                                        focusedStyle =
+                                            SpanStyle(
+                                                textDecoration = TextDecoration.Underline,
+                                                color = MaterialTheme.colorScheme.primary,
+                                                background =
+                                                    MaterialTheme.colorScheme.primary.copy(
+                                                        alpha = 0.2f
+                                                    ),
+                                            ),
+                                    ),
+                            ) {
+                                snackbarState.dismissCurrent()
+                                navController.push(Route.Donate)
+                            }
+                        ) {
+                            append(context.getString(R.string.donation_prompt_link))
+                        }
+                        append(" ")
+                        append(context.getString(R.string.donation_prompt_suffix))
+                    }
+
                     LaunchedEffect(Unit) {
                         if (uiState.shouldShowDonationSnackbar && !uiState.alreadyDonated) {
                             viewModel.setShouldShowDonationSnackbar(false)
-                            toaster.show(
-                                message =
-                                    context.getString(R.string.donation_prompt_prefix) +
-                                        " " +
-                                        context.getString(R.string.donation_prompt_link) +
-                                        " " +
-                                        context.getString(R.string.donation_prompt_suffix),
-                                type = ToastType.Normal,
-                                duration = 30_000L.milliseconds,
-                                action =
-                                    TextToastAction(
-                                        text = context.getString(R.string.donate_title),
-                                        onClick = { toastId ->
-                                            toaster.dismiss(toastId)
-                                            navController.push(Route.Donate)
-                                        },
-                                    ),
+                            snackbarState.showSnackbar(
+                                SnackbarInfo(
+                                    message = annotatedMessage,
+                                    type = SnackbarType.THANK_YOU,
+                                    durationMs = 30_000L,
+                                )
                             )
                         }
                     }
@@ -375,6 +378,25 @@ class MainActivity : AppCompatActivity() {
                                 )
                             }
                             Scaffold(
+                                snackbarHost = {
+                                    snackbarState.SnackbarHost(
+                                        modifier =
+                                            Modifier.align(Alignment.BottomCenter)
+                                                .padding(bottom = 80.dp)
+                                    ) { info ->
+                                        CustomSnackBar(
+                                            message = info.message,
+                                            type = info.type,
+                                            onDismiss = { snackbarState.dismissCurrent() },
+                                            containerColor =
+                                                MaterialTheme.colorScheme.surfaceColorAtElevation(
+                                                    2.dp
+                                                ),
+                                            modifier =
+                                                Modifier.wrapContentHeight(align = Alignment.Top),
+                                        )
+                                    }
+                                },
                                 topBar = { DynamicTopAppBar(navState) },
                                 bottomBar = {
                                     if (navState.showBottomItems) {
@@ -526,70 +548,6 @@ class MainActivity : AppCompatActivity() {
                                     )
                                 }
                             }
-                            Toaster(
-                                state = toaster,
-                                alignment = Alignment.BottomCenter,
-                                offset = IntOffset(0, -220),
-                                richColors = true,
-                                background = {
-                                    Brush.linearGradient(
-                                        listOf(
-                                            MaterialTheme.colorScheme.surfaceColorAtElevation(2.dp),
-                                            MaterialTheme.colorScheme.surfaceColorAtElevation(2.dp),
-                                        )
-                                    )
-                                },
-                                elevation = 1.dp,
-                                shadowAmbientColor =
-                                    MaterialTheme.colorScheme.onSurface.copy(alpha = 0.08f),
-                                shadowSpotColor =
-                                    MaterialTheme.colorScheme.onSurface.copy(alpha = 0.12f),
-                                border = {
-                                    BorderStroke(
-                                        0.dp,
-                                        androidx.compose.ui.graphics.Color.Transparent,
-                                    )
-                                },
-                                actionSlot = { toast ->
-                                    (toast.action as? TextToastAction)?.let { action ->
-                                        TextButton(
-                                            onClick = { action.onClick(toast) },
-                                            colors =
-                                                ButtonDefaults.textButtonColors(
-                                                    contentColor = MaterialTheme.colorScheme.primary
-                                                ),
-                                            contentPadding = PaddingValues(horizontal = 12.dp),
-                                        ) {
-                                            Text(text = action.text, fontWeight = FontWeight.Medium)
-                                        }
-                                    }
-                                },
-                                iconSlot = { toast ->
-                                    val (icon, color) =
-                                        when (toast.type) {
-                                            ToastType.Success ->
-                                                Icons.Outlined.CheckCircleOutline to SilverTree
-                                            ToastType.Error ->
-                                                Icons.Outlined.ErrorOutline to AlertRed
-                                            ToastType.Warning ->
-                                                Icons.Outlined.WarningAmber to Straw
-                                            ToastType.Info ->
-                                                Icons.Outlined.Info to
-                                                    MaterialTheme.colorScheme.onSurface
-                                            ToastType.Normal ->
-                                                Icons.Outlined.FavoriteBorder to Heart
-                                        }
-                                    Icon(
-                                        imageVector = icon,
-                                        contentDescription = null,
-                                        tint = color,
-                                        modifier = Modifier.padding(end = 12.dp),
-                                    )
-                                },
-                                contentColor = { MaterialTheme.colorScheme.onSurface },
-                                shape = { RoundedCornerShape(16.dp) },
-                                showCloseButton = true,
-                            )
                         }
                     }
                 }
@@ -597,76 +555,51 @@ class MainActivity : AppCompatActivity() {
         }
     }
 
-    fun performBackup(encrypt: Boolean = false, password: String? = null) {
+    fun performBackup() = lifecycleScope.launch {
         roomBackup
+            .database(appDatabase)
             .backupLocation(RoomBackup.BACKUP_FILE_LOCATION_CUSTOM_DIALOG)
+            .enableLogDebug(true)
+            .maxFileCount(5)
             .apply {
-                if (encrypt && !password.isNullOrBlank()) {
-                    backupIsEncrypted(true)
-                    customEncryptPassword(password)
-                }
-            }
-            .onCompleteListener { success, _, _ ->
-                lifecycleScope.launch {
-                    val sideEffect =
+                onCompleteListener { success, _, _ ->
+                    lifecycleScope.launch {
                         if (success) {
-                            GlobalSideEffect.Snackbar(
-                                StringValue.StringResource(R.string.backup_success),
-                                ToastType.Success,
+                            showToast(
+                                getString(
+                                    R.string.backup_success,
+                                    getString(R.string.restarting_app),
+                                )
                             )
+                            restartApp()
                         } else {
-                            GlobalSideEffect.Snackbar(
-                                StringValue.StringResource(R.string.backup_failed),
-                                ToastType.Error,
-                            )
+                            showToast(R.string.backup_failed)
                         }
-                    viewModel.postSideEffect(sideEffect)
+                    }
                 }
             }
             .backup()
     }
 
-    fun performRestore(encrypt: Boolean = false, password: String? = null) {
+    fun performRestore() = lifecycleScope.launch {
         roomBackup
+            .database(appDatabase)
+            .enableLogDebug(true)
             .backupLocation(RoomBackup.BACKUP_FILE_LOCATION_CUSTOM_DIALOG)
             .apply {
-                if (encrypt && !password.isNullOrBlank()) {
-                    backupIsEncrypted(true)
-                    customEncryptPassword(password)
-                }
-            }
-            .onCompleteListener { success, message, exitCode ->
-                lifecycleScope.launch {
-                    if (success) {
-                        viewModel.postSideEffect(
-                            GlobalSideEffect.Snackbar(
-                                StringValue.StringResource(R.string.restore_success),
-                                ToastType.Success,
+                onCompleteListener { success, _, _ ->
+                    lifecycleScope.launch {
+                        if (success) {
+                            showToast(
+                                getString(
+                                    R.string.restore_success,
+                                    getString(R.string.restarting_app),
+                                )
                             )
-                        )
-                        roomBackup.restartApp(Intent(this@MainActivity, MainActivity::class.java))
-                    } else {
-                        Timber.w("Restore failed, exitCode=$exitCode, message=$message")
-
-                        val errorMessage =
-                            when (exitCode) {
-                                EXIT_CODE_ERROR_WRONG_DECRYPTION_PASSWORD ->
-                                    getString(R.string.restore_failed_wrong_password)
-
-                                EXIT_CODE_ERROR,
-                                EXIT_CODE_ERROR_DECRYPTION_ERROR,
-                                EXIT_CODE_ERROR_RESTORE_BACKUP_IS_ENCRYPTED ->
-                                    getString(R.string.restore_failed_invalid_file)
-
-                                else -> getString(R.string.restore_failed)
-                            }
-
-                        viewModel.postSideEffect(
-                            GlobalSideEffect.Snackbar(
-                                StringValue.DynamicString(errorMessage),
-                                ToastType.Error,
-                            )
-                        )
+                            restartApp()
+                        } else {
+                            showToast(R.string.restore_failed)
+                        }
                     }
                 }
             }
@@ -686,20 +619,13 @@ class MainActivity : AppCompatActivity() {
 
     private fun handleIncomingIntent(intent: Intent?) {
         intent ?: return
+
         when (intent.action) {
             Intent.ACTION_VIEW,
             Intent.ACTION_EDIT,
             Intent.ACTION_SEND -> {
-                val uri: Uri? = intent.data ?: return
-                val name = uri?.lastPathSegment?.lowercase() ?: return
-                if (
-                    !name.endsWith(FileUtils.CONF_FILE_EXTENSION) &&
-                        !name.endsWith(FileUtils.ZIP_FILE_EXTENSION)
-                ) {
-                    Timber.d("Ignoring non-config URI in handleIncomingIntent: $uri")
-                    return
-                }
-                viewModel.importFromUri(uri)
+                val uri: Uri? = intent.data
+                uri?.let { viewModel.importFromUri(it) }
             }
         }
     }

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

@@ -6,8 +6,11 @@ import com.zaneschepke.tunnel.backend.Backend
 import com.zaneschepke.tunnel.di.tunnelModule
 import com.zaneschepke.tunnel.service.VpnService
 import com.zaneschepke.wireguardautotunnel.core.event.TunnelEventDispatcher
+import com.zaneschepke.wireguardautotunnel.core.notification.NotificationService
 import com.zaneschepke.wireguardautotunnel.core.orchestration.AppBoostrapCoordinator
 import com.zaneschepke.wireguardautotunnel.core.orchestration.TunnelCoordinator
+import com.zaneschepke.wireguardautotunnel.core.service.tile.AutoTunnelTileRefresher
+import com.zaneschepke.wireguardautotunnel.core.service.tile.TunnelTileRefresher
 import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelProvider
 import com.zaneschepke.wireguardautotunnel.di.Dispatcher
 import com.zaneschepke.wireguardautotunnel.di.Scope
@@ -18,9 +21,6 @@ import com.zaneschepke.wireguardautotunnel.di.dispatchersModule
 import com.zaneschepke.wireguardautotunnel.di.networkModule
 import com.zaneschepke.wireguardautotunnel.di.tunnelBackendProviderModule
 import com.zaneschepke.wireguardautotunnel.di.workerModule
-import com.zaneschepke.wireguardautotunnel.notification.NotificationService
-import com.zaneschepke.wireguardautotunnel.service.tile.AutoTunnelTileRefresher
-import com.zaneschepke.wireguardautotunnel.service.tile.TunnelTileRefresher
 import com.zaneschepke.wireguardautotunnel.util.ReleaseTree
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope
@@ -71,10 +71,11 @@ class WireGuardAutoTunnel : Application(), KoinComponent {
             lazyModules(networkModule)
         }
         instance = this
-
         notificationService.createAllChannels()
 
-        syncTiles()
+        // Sync tiles
+        AutoTunnelTileRefresher.refresh(this)
+        TunnelTileRefresher.refresh(this)
 
         if (BuildConfig.DEBUG) {
             Timber.plant(Timber.DebugTree())
@@ -110,11 +111,6 @@ class WireGuardAutoTunnel : Application(), KoinComponent {
         applicationScope.launch(ioDispatcher) { boostrapCoordinator.bootstrap() }
     }
 
-    private fun syncTiles() {
-        AutoTunnelTileRefresher.refresh(this)
-        TunnelTileRefresher.refresh(this)
-    }
-
     companion object {
         lateinit var instance: WireGuardAutoTunnel
             private set

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

@@ -3,11 +3,11 @@ package com.zaneschepke.wireguardautotunnel.core.broadcast
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
+import com.zaneschepke.wireguardautotunnel.core.notification.NotificationService
 import com.zaneschepke.wireguardautotunnel.core.orchestration.AutoTunnelCoordinator
 import com.zaneschepke.wireguardautotunnel.core.orchestration.TunnelCoordinator
 import com.zaneschepke.wireguardautotunnel.di.Scope
 import com.zaneschepke.wireguardautotunnel.domain.enums.NotificationAction
-import com.zaneschepke.wireguardautotunnel.notification.NotificationService
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
 import org.koin.core.component.KoinComponent

app/src/main/java/com/zaneschepke/wireguardautotunnel/core/event/TunnelEventDispatcher.kt

@@ -1,41 +1,29 @@
 package com.zaneschepke.wireguardautotunnel.core.event
 
 import android.content.Context
-import com.dokar.sonner.ToastType
 import com.zaneschepke.tunnel.event.TunnelEvent
 import com.zaneschepke.tunnel.model.BackendMode
 import com.zaneschepke.tunnel.state.BackendStatus
 import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.domain.repository.GlobalEffectRepository
+import com.zaneschepke.wireguardautotunnel.core.notification.TunnelNotificationLine
+import com.zaneschepke.wireguardautotunnel.core.notification.TunnelNotificationService
 import com.zaneschepke.wireguardautotunnel.domain.repository.TunnelRepository
-import com.zaneschepke.wireguardautotunnel.domain.sideeffect.GlobalSideEffect
-import com.zaneschepke.wireguardautotunnel.lifecyle.AppVisibilityObserver
-import com.zaneschepke.wireguardautotunnel.notification.TunnelNotificationLine
-import com.zaneschepke.wireguardautotunnel.notification.TunnelNotificationService
 import com.zaneschepke.wireguardautotunnel.ui.state.DisplayTunnelState
-import com.zaneschepke.wireguardautotunnel.util.StringValue
-import kotlin.time.Duration.Companion.milliseconds
 import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.FlowPreview
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.combine
-import kotlinx.coroutines.flow.debounce
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.onEach
-import kotlinx.coroutines.launch
 
 class TunnelEventDispatcher(
     private val notificationManager: TunnelNotificationService,
     private val tunnelRepository: TunnelRepository,
     private val context: Context,
-    private val appVisibilityObserver: AppVisibilityObserver,
-    private val globalEffectRepository: GlobalEffectRepository,
 ) {
 
-    @OptIn(FlowPreview::class)
     fun bind(
         scope: CoroutineScope,
         providerEvents: Flow<TunnelEvent>,
@@ -44,174 +32,54 @@ class TunnelEventDispatcher(
         tunnelDisplayStates: StateFlow<Map<Int, DisplayTunnelState>>,
     ) {
 
-        // Informational events from tunnel backend
+        // informational events
         providerEvents
+            .distinctUntilChanged()
             .onEach { event ->
                 when (event) {
                     is TunnelEvent.FallbackToIpv4 -> {
                         val name = getTunnelName(event.tunnelId)
-                        showOrNotify(
-                            scope = scope,
-                            foregroundAction = {
-                                globalEffectRepository.post(
-                                    GlobalSideEffect.Snackbar(
-                                        message =
-                                            StringValue.DynamicString(
-                                                context.getString(
-                                                    R.string.notification_ipv4_fallback_message,
-                                                    name,
-                                                )
-                                            ),
-                                        type = ToastType.Info,
-                                    )
-                                )
-                            },
-                            backgroundAction = { notificationManager.showIpv4Fallback(name) },
-                        )
+                        notificationManager.showIpv4Fallback(name)
                     }
 
                     is TunnelEvent.RecoveredToIpv6 -> {
                         val name = getTunnelName(event.tunnelId)
-                        showOrNotify(
-                            scope = scope,
-                            foregroundAction = {
-                                globalEffectRepository.post(
-                                    GlobalSideEffect.Snackbar(
-                                        message =
-                                            StringValue.DynamicString(
-                                                context.getString(
-                                                    R.string.notification_ipv6_recovery_message,
-                                                    name,
-                                                )
-                                            ),
-                                        type = ToastType.Success,
-                                    )
-                                )
-                            },
-                            backgroundAction = { notificationManager.showIpv6Recovery(name) },
-                        )
+                        notificationManager.showIpv6Recovery(name)
                     }
 
                     is TunnelEvent.DynamicDnsUpdate -> {
                         val name = getTunnelName(event.tunnelId)
-                        showOrNotify(
-                            scope = scope,
-                            foregroundAction = {
-                                globalEffectRepository.post(
-                                    GlobalSideEffect.Snackbar(
-                                        message =
-                                            StringValue.DynamicString(
-                                                context.getString(
-                                                    R.string.notification_dynamic_dns_message,
-                                                    name,
-                                                )
-                                            ),
-                                        type = ToastType.Info,
-                                    )
-                                )
-                            },
-                            backgroundAction = { notificationManager.showDynamicDnsUpdate(name) },
-                        )
+                        notificationManager.showDynamicDnsUpdate(name)
                     }
 
                     is TunnelEvent.NoRootShellAccess -> {
-                        showOrNotify(
-                            scope = scope,
-                            foregroundAction = {
-                                globalEffectRepository.post(
-                                    GlobalSideEffect.Snackbar(
-                                        message =
-                                            StringValue.DynamicString(
-                                                context.getString(R.string.error_root_denied)
-                                            ),
-                                        type = ToastType.Error,
-                                    )
-                                )
-                            },
-                            backgroundAction = { notificationManager.showRootShellAccess() },
-                        )
+                        notificationManager.showRootShellAccess()
                     }
                 }
             }
             .launchIn(scope)
 
-        // Errors from our tunnel coordinator
+        // errors from the coordinator
         coordinatorErrors
+            .distinctUntilChanged()
             .onEach { error ->
                 when (error) {
                     is TunnelErrorEvent.VpnPermissionDenied -> {
-                        showOrNotify(
-                            scope = scope,
-                            foregroundAction = {
-                                globalEffectRepository.post(
-                                    GlobalSideEffect.Snackbar(
-                                        message =
-                                            StringValue.DynamicString(
-                                                context.getString(R.string.vpn_permission_required)
-                                            ),
-                                        type = ToastType.Error,
-                                    )
-                                )
-                            },
-                            backgroundAction = { notificationManager.showVpnRequired() },
-                        )
+                        notificationManager.showVpnRequired()
                     }
 
                     is TunnelErrorEvent.InternalFailure -> {
-                        showOrNotify(
-                            scope = scope,
-                            foregroundAction = {
-                                globalEffectRepository.post(
-                                    GlobalSideEffect.Snackbar(
-                                        message = StringValue.DynamicString(error.message),
-                                        type = ToastType.Error,
-                                    )
-                                )
-                            },
-                            backgroundAction = { notificationManager.showError(error.message) },
-                        )
+                        notificationManager.showError(error.message)
                     }
 
                     is TunnelErrorEvent.Socks5PortUnavailable -> {
                         val name = getTunnelName(error.tunnelId)
-                        val message =
-                            context.getString(R.string.error_socks5_port_unavailable, error.port)
-
-                        showOrNotify(
-                            scope = scope,
-                            foregroundAction = {
-                                globalEffectRepository.post(
-                                    GlobalSideEffect.Snackbar(
-                                        message = StringValue.DynamicString(message),
-                                        type = ToastType.Error,
-                                    )
-                                )
-                            },
-                            backgroundAction = {
-                                notificationManager.showSocks5PortUnavailable(error.port, name)
-                            },
-                        )
+                        notificationManager.showSocks5PortUnavailable(error.port, name)
                     }
 
                     is TunnelErrorEvent.HttpPortUnavailable -> {
                         val name = getTunnelName(error.tunnelId)
-                        val message =
-                            context.getString(R.string.error_http_port_unavailable, error.port)
-
-                        showOrNotify(
-                            scope = scope,
-                            foregroundAction = {
-                                globalEffectRepository.post(
-                                    GlobalSideEffect.Snackbar(
-                                        message = StringValue.DynamicString(message),
-                                        type = ToastType.Error,
-                                    )
-                                )
-                            },
-                            backgroundAction = {
-                                notificationManager.showHttpPortUnavailable(error.port, name)
-                            },
-                        )
+                        notificationManager.showHttpPortUnavailable(error.port, name)
                     }
                 }
             }
@@ -245,7 +113,6 @@ class TunnelEventDispatcher(
                     .associateBy { it.id }
             }
             .distinctUntilChanged()
-            .debounce(500.milliseconds) // give the service notification time to display
             .onEach { vpnLines -> notificationManager.updateVpnPersistentNotification(vpnLines) }
             .launchIn(scope)
 
@@ -273,25 +140,12 @@ class TunnelEventDispatcher(
                     .associateBy { it.id }
             }
             .distinctUntilChanged()
-            .debounce(500.milliseconds) // give the service notification time to display
             .onEach { proxyLines ->
                 notificationManager.updateProxyPersistentNotification(proxyLines)
             }
             .launchIn(scope)
     }
 
-    private fun showOrNotify(
-        scope: CoroutineScope,
-        foregroundAction: suspend () -> Unit,
-        backgroundAction: () -> Unit,
-    ) {
-        if (appVisibilityObserver.isForeground.value) {
-            scope.launch { foregroundAction() }
-        } else {
-            backgroundAction()
-        }
-    }
-
     private suspend fun getTunnelName(tunnelId: Int): String {
         return tunnelRepository.getById(tunnelId)?.name ?: context.getString(R.string.unknown)
     }

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

@@ -1,4 +1,4 @@
-package com.zaneschepke.wireguardautotunnel.notification
+package com.zaneschepke.wireguardautotunnel.core.notification
 
 import android.Manifest
 import android.app.Notification
@@ -17,8 +17,8 @@ import androidx.core.app.NotificationManagerCompat.IMPORTANCE_HIGH
 import com.zaneschepke.wireguardautotunnel.MainActivity
 import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.core.broadcast.NotificationActionReceiver
+import com.zaneschepke.wireguardautotunnel.core.notification.NotificationService.Companion.EXTRA_ID
 import com.zaneschepke.wireguardautotunnel.domain.enums.NotificationAction
-import com.zaneschepke.wireguardautotunnel.notification.NotificationService.Companion.EXTRA_ID
 import com.zaneschepke.wireguardautotunnel.util.StringValue
 
 class AndroidNotificationService(override val context: Context) : NotificationService {

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

@@ -1,116 +1,21 @@
-package com.zaneschepke.wireguardautotunnel.notification
+package com.zaneschepke.wireguardautotunnel.core.notification
 
 import androidx.core.app.NotificationCompat
 import com.zaneschepke.wireguardautotunnel.R
+import com.zaneschepke.wireguardautotunnel.core.notification.AndroidNotificationService.NotificationChannels
+import com.zaneschepke.wireguardautotunnel.core.notification.NotificationService.Companion.PROXY_GROUP_KEY
+import com.zaneschepke.wireguardautotunnel.core.notification.NotificationService.Companion.PROXY_NOTIFICATION_ID
+import com.zaneschepke.wireguardautotunnel.core.notification.NotificationService.Companion.TUNNEL_ERROR_NOTIFICATION_ID
+import com.zaneschepke.wireguardautotunnel.core.notification.NotificationService.Companion.TUNNEL_MESSAGES_NOTIFICATION_ID
+import com.zaneschepke.wireguardautotunnel.core.notification.NotificationService.Companion.VPN_GROUP_KEY
+import com.zaneschepke.wireguardautotunnel.core.notification.NotificationService.Companion.VPN_NOTIFICATION_ID
 import com.zaneschepke.wireguardautotunnel.domain.enums.NotificationAction
-import com.zaneschepke.wireguardautotunnel.notification.AndroidNotificationService.NotificationChannels
-import com.zaneschepke.wireguardautotunnel.notification.NotificationService.Companion.PROXY_GROUP_KEY
-import com.zaneschepke.wireguardautotunnel.notification.NotificationService.Companion.PROXY_NOTIFICATION_ID
-import com.zaneschepke.wireguardautotunnel.notification.NotificationService.Companion.TUNNEL_ERROR_NOTIFICATION_ID
-import com.zaneschepke.wireguardautotunnel.notification.NotificationService.Companion.TUNNEL_MESSAGES_NOTIFICATION_ID
-import com.zaneschepke.wireguardautotunnel.notification.NotificationService.Companion.VPN_GROUP_KEY
-import com.zaneschepke.wireguardautotunnel.notification.NotificationService.Companion.VPN_NOTIFICATION_ID
 
 class AndroidTunnelNotificationService(private val notificationService: NotificationService) :
     TunnelNotificationService {
 
     private val context = notificationService.context
 
-    private fun createGroupNotification(
-        tunnelNotificationLines: Map<Int, TunnelNotificationLine>,
-        channel: NotificationChannels.Tunnel,
-        groupKey: String,
-    ): android.app.Notification {
-        val title =
-            if (tunnelNotificationLines.size == 1) {
-                val name = tunnelNotificationLines.values.first().name
-                when (channel) {
-                    is NotificationChannels.Tunnel.VPN ->
-                        "${context.getString(R.string.vpn)} • $name"
-                    is NotificationChannels.Tunnel.Proxy ->
-                        "${context.getString(R.string.proxy)} • $name"
-                }
-            } else {
-                when (channel) {
-                    is NotificationChannels.Tunnel.VPN -> context.getString(R.string.vpn)
-                    is NotificationChannels.Tunnel.Proxy -> context.getString(R.string.proxy)
-                }
-            }
-
-        val formattedLines =
-            tunnelNotificationLines.values.map { line ->
-                val status = line.displayState.asLocalizedString(context)
-
-                if (tunnelNotificationLines.size == 1) {
-                    status
-                } else {
-                    context.getString(R.string.notification_tunnel_status_format, line.name, status)
-                }
-            }
-        val description = formattedLines.joinToString("\n")
-
-        val actions =
-            if (tunnelNotificationLines.size == 1) {
-                val tunnelId = tunnelNotificationLines.keys.first()
-                listOf(
-                    notificationService.createNotificationAction(
-                        notificationAction = NotificationAction.TUNNEL_OFF,
-                        extraId = tunnelId,
-                    )
-                )
-            } else {
-                listOf(
-                    notificationService.createNotificationAction(
-                        notificationAction = NotificationAction.STOP_ALL,
-                        extraId = null,
-                    )
-                )
-            }
-
-        val style =
-            if (tunnelNotificationLines.size > 1) {
-                NotificationCompat.InboxStyle()
-                    .setBigContentTitle(title)
-                    .setSummaryText(
-                        "${tunnelNotificationLines.size} ${context.getString(R.string.tunnels).lowercase()}"
-                    )
-                    .also { inbox -> formattedLines.forEach { inbox.addLine(it) } }
-            } else {
-                null
-            }
-
-        return notificationService.createNotification(
-            channel = channel,
-            title = title,
-            description = description,
-            actions = actions,
-            onGoing = true,
-            onlyAlertOnce = true,
-            groupKey = groupKey,
-            style = style,
-        )
-    }
-
-    override fun buildVpnPersistentNotification(
-        tunnelNotificationLines: Map<Int, TunnelNotificationLine>
-    ): android.app.Notification {
-        return createGroupNotification(
-            tunnelNotificationLines,
-            NotificationChannels.Tunnel.VPN,
-            VPN_GROUP_KEY,
-        )
-    }
-
-    override fun buildProxyPersistentNotification(
-        tunnelNotificationLines: Map<Int, TunnelNotificationLine>
-    ): android.app.Notification {
-        return createGroupNotification(
-            tunnelNotificationLines,
-            NotificationChannels.Tunnel.Proxy,
-            PROXY_GROUP_KEY,
-        )
-    }
-
     private fun updateGroupNotification(
         tunnelNotificationLines: Map<Int, TunnelNotificationLine>,
         notificationId: Int,
@@ -183,36 +88,26 @@ class AndroidTunnelNotificationService(private val notificationService: Notifica
         notificationService.show(notificationId, notification)
     }
 
-    override fun updateVpnPersistentNotification(
-        tunnelNotificationLines: Map<Int, TunnelNotificationLine>
-    ) {
-        if (tunnelNotificationLines.isEmpty()) {
-            notificationService.remove(VPN_NOTIFICATION_ID)
-            return
-        }
-        val notification =
-            createGroupNotification(
-                tunnelNotificationLines,
-                NotificationChannels.Tunnel.VPN,
-                VPN_GROUP_KEY,
-            )
-        notificationService.show(VPN_NOTIFICATION_ID, notification)
-    }
-
     override fun updateProxyPersistentNotification(
         tunnelNotificationLines: Map<Int, TunnelNotificationLine>
     ) {
-        if (tunnelNotificationLines.isEmpty()) {
-            notificationService.remove(PROXY_NOTIFICATION_ID)
-            return
-        }
-        val notification =
-            createGroupNotification(
-                tunnelNotificationLines,
-                NotificationChannels.Tunnel.Proxy,
-                PROXY_GROUP_KEY,
-            )
-        notificationService.show(PROXY_NOTIFICATION_ID, notification)
+        updateGroupNotification(
+            tunnelNotificationLines = tunnelNotificationLines,
+            notificationId = PROXY_NOTIFICATION_ID,
+            channel = NotificationChannels.Tunnel.Proxy,
+            groupKey = PROXY_GROUP_KEY,
+        )
+    }
+
+    override fun updateVpnPersistentNotification(
+        tunnelNotificationLines: Map<Int, TunnelNotificationLine>
+    ) {
+        updateGroupNotification(
+            tunnelNotificationLines = tunnelNotificationLines,
+            notificationId = VPN_NOTIFICATION_ID,
+            channel = NotificationChannels.Tunnel.VPN,
+            groupKey = VPN_GROUP_KEY,
+        )
     }
 
     override fun showIpv4Fallback(tunnelName: String) {

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

@@ -1,10 +1,10 @@
-package com.zaneschepke.wireguardautotunnel.notification
+package com.zaneschepke.wireguardautotunnel.core.notification
 
 import android.app.Notification
 import android.content.Context
 import androidx.core.app.NotificationCompat
+import com.zaneschepke.wireguardautotunnel.core.notification.AndroidNotificationService.NotificationChannels
 import com.zaneschepke.wireguardautotunnel.domain.enums.NotificationAction
-import com.zaneschepke.wireguardautotunnel.notification.AndroidNotificationService.NotificationChannels
 import com.zaneschepke.wireguardautotunnel.util.StringValue
 
 interface NotificationService {

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

@@ -1,4 +1,4 @@
-package com.zaneschepke.wireguardautotunnel.notification
+package com.zaneschepke.wireguardautotunnel.core.notification
 
 import com.zaneschepke.wireguardautotunnel.ui.state.DisplayTunnelState
 

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

@@ -1,6 +1,4 @@
-package com.zaneschepke.wireguardautotunnel.notification
-
-import android.app.Notification
+package com.zaneschepke.wireguardautotunnel.core.notification
 
 interface TunnelNotificationService {
 
@@ -8,14 +6,6 @@ interface TunnelNotificationService {
 
     fun updateVpnPersistentNotification(tunnelNotificationLines: Map<Int, TunnelNotificationLine>)
 
-    fun buildVpnPersistentNotification(
-        tunnelNotificationLines: Map<Int, TunnelNotificationLine>
-    ): Notification
-
-    fun buildProxyPersistentNotification(
-        tunnelNotificationLines: Map<Int, TunnelNotificationLine>
-    ): Notification
-
     fun showIpv4Fallback(tunnelName: String)
 
     fun showIpv6Recovery(tunnelName: String)

app/src/main/java/com/zaneschepke/wireguardautotunnel/core/orchestration/AutoTunnelCoordinator.kt

@@ -1,8 +1,8 @@
 package com.zaneschepke.wireguardautotunnel.core.orchestration
 
+import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
+import com.zaneschepke.wireguardautotunnel.core.service.autotunnel.AutoTunnelStateHolder
 import com.zaneschepke.wireguardautotunnel.domain.repository.AutoTunnelSettingsRepository
-import com.zaneschepke.wireguardautotunnel.service.ServiceManager
-import com.zaneschepke.wireguardautotunnel.service.autotunnel.AutoTunnelStateHolder
 
 class AutoTunnelCoordinator(
     private val repository: AutoTunnelSettingsRepository,

app/src/main/java/com/zaneschepke/wireguardautotunnel/core/orchestration/TunnelCoordinator.kt

@@ -2,6 +2,7 @@ package com.zaneschepke.wireguardautotunnel.core.orchestration
 
 import com.zaneschepke.tunnel.model.BackendMode
 import com.zaneschepke.wireguardautotunnel.core.event.TunnelErrorEvent
+import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
 import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelProvider
 import com.zaneschepke.wireguardautotunnel.data.repository.RoomDnsSettingsRepository
 import com.zaneschepke.wireguardautotunnel.domain.enums.TunnelActionSource
@@ -16,7 +17,6 @@ import com.zaneschepke.wireguardautotunnel.domain.repository.GeneralSettingRepos
 import com.zaneschepke.wireguardautotunnel.domain.repository.MonitoringSettingsRepository
 import com.zaneschepke.wireguardautotunnel.domain.repository.ProxySettingsRepository
 import com.zaneschepke.wireguardautotunnel.domain.repository.TunnelRepository
-import com.zaneschepke.wireguardautotunnel.service.ServiceManager
 import com.zaneschepke.wireguardautotunnel.ui.state.DisplayTunnelState
 import kotlin.time.Duration.Companion.milliseconds
 import kotlinx.coroutines.CoroutineScope
@@ -47,9 +47,6 @@ class TunnelCoordinator(
     scope: CoroutineScope,
 ) {
 
-    private val _userOverrideFlow = MutableSharedFlow<Unit>(extraBufferCapacity = 1)
-    val userOverrideFlow = _userOverrideFlow.asSharedFlow()
-
     @OptIn(FlowPreview::class)
     val tunnelDisplayStates: StateFlow<Map<Int, DisplayTunnelState>> =
         tunnelProvider.backendStatus
@@ -110,24 +107,11 @@ class TunnelCoordinator(
     ) = tunnelMutex.withLock {
         // wait for app to be bootstrapped
         bootstrapCoordinator.isReady.first { it }
-
-        if (source == TunnelActionSource.USER) {
-            _userOverrideFlow.tryEmit(Unit)
-        }
-
-        // enforce single tunnel, for now
-        if (backendStatus.value.activeTunnels.isNotEmpty()) {
-            stopActiveTunnelsInternal()
-        }
-
         startTunnelInternal(config, source)
     }
 
     suspend fun stopTunnel(id: Int, source: TunnelActionSource = TunnelActionSource.USER) =
         tunnelMutex.withLock {
-            if (source == TunnelActionSource.USER) {
-                _userOverrideFlow.tryEmit(Unit)
-            }
             stopTunnelInternal(id, source)
         }
 
@@ -183,6 +167,9 @@ class TunnelCoordinator(
                 }
             }
 
+        // TODO for now, enforce single tunnel until multi-tunneling is implement
+        stopActiveTunnelsInternal()
+
         tunnelProvider
             .startTunnel(
                 tunnel =
@@ -206,10 +193,6 @@ class TunnelCoordinator(
 
     suspend fun toggleTunnels(source: TunnelActionSource = TunnelActionSource.USER) =
         tunnelMutex.withLock {
-            if (source == TunnelActionSource.USER) {
-                _userOverrideFlow.tryEmit(Unit)
-            }
-
             val active = tunnelProvider.backendStatus.value.activeTunnels
             if (active.isNotEmpty()) {
                 lastActiveTunnels = active.keys.toList()

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

@@ -1,9 +1,9 @@
-package com.zaneschepke.wireguardautotunnel.service
+package com.zaneschepke.wireguardautotunnel.core.service
 
 import android.content.Context
 import android.content.Intent
 import android.net.VpnService
-import com.zaneschepke.wireguardautotunnel.service.autotunnel.AutoTunnelService
+import com.zaneschepke.wireguardautotunnel.core.service.autotunnel.AutoTunnelService
 
 class ServiceManager(private val context: Context) {
 

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

@@ -1,4 +1,4 @@
-package com.zaneschepke.wireguardautotunnel.service.autotunnel
+package com.zaneschepke.wireguardautotunnel.core.service.autotunnel
 
 import com.zaneschepke.wireguardautotunnel.domain.events.AutoTunnelEvent
 import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConfig
@@ -17,7 +17,6 @@ class AutoTunnelEngine {
                 }
             }
             Decision.None -> AutoTunnelEvent.DoNothing
-            is Decision.StopDueToNoInternet -> AutoTunnelEvent.StopAllDueToNoInternet
         }
     }
 
@@ -28,17 +27,13 @@ class AutoTunnelEngine {
 
         val activeTunnelIds = backend.activeTunnels.keys.toSet()
 
-        if (!network.hasInternet()) {
-            return if (settings.isStopOnNoInternetEnabled) {
-                Decision.StopDueToNoInternet
-            } else {
-                // keep tunnel state neutral on no internet otherwise
-                Decision.None
-            }
-        }
-
         val desiredTunnels = resolveDesiredTunnels(state).map { it.id }.toSet()
 
+        // stop condition overrides everything
+        if (!network.hasInternet() && settings.isStopOnNoInternetEnabled) {
+            return Decision.Sync(start = emptySet(), stop = activeTunnelIds)
+        }
+
         val toStart = desiredTunnels - activeTunnelIds
         val toStop = activeTunnelIds - desiredTunnels
 
@@ -101,7 +96,5 @@ class AutoTunnelEngine {
         data class Sync(val start: Set<TunnelConfig>, val stop: Set<Int>) : Decision
 
         data object None : Decision
-
-        data object StopDueToNoInternet : Decision
     }
 }

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

@@ -1,4 +1,4 @@
-package com.zaneschepke.wireguardautotunnel.service.autotunnel
+package com.zaneschepke.wireguardautotunnel.core.service.autotunnel
 
 import android.content.Intent
 import androidx.core.app.ServiceCompat
@@ -7,12 +7,16 @@ import androidx.lifecycle.lifecycleScope
 import com.zaneschepke.networkmonitor.AndroidNetworkMonitor
 import com.zaneschepke.networkmonitor.StableNetworkEngine
 import com.zaneschepke.wireguardautotunnel.R
+import com.zaneschepke.wireguardautotunnel.core.notification.AndroidNotificationService
+import com.zaneschepke.wireguardautotunnel.core.notification.NotificationService
 import com.zaneschepke.wireguardautotunnel.core.orchestration.TunnelCoordinator
+import com.zaneschepke.wireguardautotunnel.core.service.tile.AutoTunnelTileRefresher
 import com.zaneschepke.wireguardautotunnel.di.Dispatcher
 import com.zaneschepke.wireguardautotunnel.domain.enums.NotificationAction
 import com.zaneschepke.wireguardautotunnel.domain.enums.TunnelActionSource
 import com.zaneschepke.wireguardautotunnel.domain.enums.TunnelMode
 import com.zaneschepke.wireguardautotunnel.domain.events.AutoTunnelEvent
+import com.zaneschepke.wireguardautotunnel.domain.events.TunnelActionEvent
 import com.zaneschepke.wireguardautotunnel.domain.model.AutoTunnelSettings
 import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConfig
 import com.zaneschepke.wireguardautotunnel.domain.repository.AutoTunnelSettingsRepository
@@ -20,22 +24,15 @@ import com.zaneschepke.wireguardautotunnel.domain.repository.GeneralSettingRepos
 import com.zaneschepke.wireguardautotunnel.domain.repository.TunnelRepository
 import com.zaneschepke.wireguardautotunnel.domain.state.AutoTunnelState
 import com.zaneschepke.wireguardautotunnel.domain.state.toDomain
-import com.zaneschepke.wireguardautotunnel.notification.AndroidNotificationService
-import com.zaneschepke.wireguardautotunnel.notification.NotificationService
-import com.zaneschepke.wireguardautotunnel.service.tile.AutoTunnelTileRefresher
 import com.zaneschepke.wireguardautotunnel.util.Constants
 import com.zaneschepke.wireguardautotunnel.util.extensions.to
-import kotlin.time.Duration.Companion.milliseconds
 import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.FlowPreview
 import kotlinx.coroutines.Job
-import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.flow.combine
-import kotlinx.coroutines.flow.debounce
 import kotlinx.coroutines.flow.distinctUntilChanged
-import kotlinx.coroutines.flow.firstOrNull
+import kotlinx.coroutines.flow.distinctUntilChangedBy
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.mapNotNull
 import kotlinx.coroutines.launch
@@ -66,7 +63,8 @@ class AutoTunnelService : LifecycleService() {
     private var autoTunnelJob: Job? = null
     private var permissionsJob: Job? = null
     private var overridesJob: Job? = null
-    private var noInternetStopJob: Job? = null
+
+    @Volatile private var manualOverrideState = ManualOverrideState()
 
     private data class PermissionWarningState(
         val detectionMethod: AndroidNetworkMonitor.WifiDetectionMethod,
@@ -75,19 +73,19 @@ class AutoTunnelService : LifecycleService() {
         val ssidReadRequired: Boolean,
     )
 
-    @Volatile private var hasUserOverride = false
-    private var lastNetworkFingerprint: AutoTunnelState.NetworkFingerprint? = null
+    private data class ManualOverrideState(
+        val fingerprint: AutoTunnelState.NetworkFingerprint? = null,
+        val stoppedTunnelIds: Set<Int> = emptySet(),
+        val startedTunnelIds: Set<Int> = emptySet(),
+    )
 
-    @OptIn(FlowPreview::class)
     private val autoTunnelStateFlow: Flow<AutoTunnelState> by lazy {
         val networkFlow = networkEngine.stableState.mapNotNull { it?.state?.toDomain() }
 
         val settingsFlow = combineSettings()
 
         val backendFlow =
-            tunnelCoordinator.backendStatus
-                .distinctUntilChanged { old, new -> old.activeTunnels == new.activeTunnels }
-                .debounce(300L.milliseconds)
+            tunnelCoordinator.backendStatus.distinctUntilChangedBy { it.activeTunnels.keys.toSet() }
 
         combine(networkFlow, settingsFlow, backendFlow) { network, settings, backend ->
                 AutoTunnelState(
@@ -123,7 +121,7 @@ class AutoTunnelService : LifecycleService() {
         permissionsJob?.cancel()
         permissionsJob = startLocationPermissionsNotificationJob()
         overridesJob?.cancel()
-        overridesJob = startUserOverrideJob()
+        overridesJob = startOverridesJob()
     }
 
     fun stop() {
@@ -132,23 +130,48 @@ class AutoTunnelService : LifecycleService() {
     }
 
     override fun onDestroy() {
-        cancelNoInternetStopJob()
         ServiceCompat.stopForeground(this, ServiceCompat.STOP_FOREGROUND_REMOVE)
         stateHolder.setActive(false)
         AutoTunnelTileRefresher.refresh(this)
         super.onDestroy()
     }
 
-    private fun startUserOverrideJob(): Job =
+    private fun startOverridesJob(): Job =
         lifecycleScope.launch(ioDispatcher) {
-            tunnelCoordinator.userOverrideFlow.collect {
+            tunnelCoordinator.actions.collect { action ->
                 reconciliationMutex.withLock {
-                    if (!hasUserOverride) {
-                        Timber.d(
-                            "User manually overrode Auto Tunnel on current network. Pausing auto decisions."
-                        )
-                    }
-                    hasUserOverride = true
+                    manualOverrideState =
+                        when (action) {
+                            is TunnelActionEvent.Started -> {
+
+                                if (action.source != TunnelActionSource.USER) {
+                                    return@withLock
+                                }
+
+                                manualOverrideState.copy(
+                                    startedTunnelIds =
+                                        manualOverrideState.startedTunnelIds + action.tunnelId,
+                                    stoppedTunnelIds =
+                                        manualOverrideState.stoppedTunnelIds - action.tunnelId,
+                                )
+                            }
+
+                            is TunnelActionEvent.Stopped -> {
+
+                                if (action.source != TunnelActionSource.USER) {
+                                    return@withLock
+                                }
+
+                                manualOverrideState.copy(
+                                    stoppedTunnelIds =
+                                        manualOverrideState.stoppedTunnelIds + action.tunnelId,
+                                    startedTunnelIds =
+                                        manualOverrideState.startedTunnelIds - action.tunnelId,
+                                )
+                            }
+                        }
+
+                    Timber.d("Updated manual overrides: $manualOverrideState")
                 }
             }
         }
@@ -179,83 +202,50 @@ class AutoTunnelService : LifecycleService() {
         )
     }
 
-    // Instead of stopping tunnel right away on no internet, we kick off this job to add short delay
-    // and re-evaluation to prevent unwanted stops
-    // on flaky networks and network transitions
-    private fun scheduleNoInternetStop() {
-        noInternetStopJob?.cancel()
-
-        noInternetStopJob =
-            lifecycleScope.launch(ioDispatcher) {
-                delay(NO_INTERNET_GRACE_PERIOD_MS.milliseconds)
-
-                reconciliationMutex.withLock {
-                    val currentNetworkState = networkEngine.stableState.value?.state?.toDomain()
-
-                    val stillNoInternet = currentNetworkState?.hasInternet() == false
-                    val stopOnNoInternetEnabled =
-                        autoTunnelRepository.flow.firstOrNull()?.isStopOnNoInternetEnabled == true
-
-                    if (stillNoInternet && stopOnNoInternetEnabled) {
-                        val currentActiveIds =
-                            tunnelCoordinator.backendStatus.value.activeTunnels.keys
-
-                        if (currentActiveIds.isNotEmpty()) {
-                            Timber.w(
-                                "No internet grace period expired and still no internet. Stopping tunnels: $currentActiveIds"
-                            )
-                            currentActiveIds.forEach { tunnelId ->
-                                tunnelCoordinator.stopTunnel(
-                                    tunnelId,
-                                    TunnelActionSource.AUTO_TUNNEL,
-                                )
-                            }
-                        }
-                    } else {
-                        Timber.d(
-                            "No internet grace period expired, but internet is back or setting disabled. Doing nothing."
-                        )
-                    }
-                }
-            }
-    }
-
-    private fun cancelNoInternetStopJob() {
-        noInternetStopJob?.cancel()
-        noInternetStopJob = null
-    }
-
     private fun startAutoTunnelStateJob(): Job =
         lifecycleScope.launch(ioDispatcher) {
             autoTunnelStateFlow.collectLatest { state ->
                 reconciliationMutex.withLock {
                     updateFingerprintIfNeeded(state)
+
                     val rawEvent = engine.evaluate(state)
+
                     val event = applyOverrides(rawEvent)
+
                     Timber.d("AutoTunnel reconciliation event: $event")
+
                     handleAutoTunnelEvent(event)
                 }
             }
         }
 
     private fun updateFingerprintIfNeeded(state: AutoTunnelState) {
-        val currentFingerprint = state.networkFingerPrint
+        val fingerprint = state.networkFingerPrint
 
-        if (lastNetworkFingerprint != currentFingerprint) {
-            if (hasUserOverride) {
-                Timber.d("Network fingerprint changed, clearing user override")
-            }
-            hasUserOverride = false
-            lastNetworkFingerprint = currentFingerprint
+        if (manualOverrideState.fingerprint != fingerprint) {
+            Timber.d("Network changed, clearing overrides")
+
+            manualOverrideState = ManualOverrideState(fingerprint = fingerprint)
         }
     }
 
     private fun applyOverrides(event: AutoTunnelEvent): AutoTunnelEvent {
-        return if (hasUserOverride) {
-            AutoTunnelEvent.DoNothing
-        } else {
-            event
+
+        if (event !is AutoTunnelEvent.Sync) {
+            return event
         }
+
+        val filteredStart =
+            event.start.filterNot { it.id in manualOverrideState.stoppedTunnelIds }.toSet()
+
+        val filteredStop =
+            event.stop.filterNot { it in manualOverrideState.startedTunnelIds }.toSet()
+
+        if (filteredStart.isEmpty() && filteredStop.isEmpty()) {
+            return AutoTunnelEvent.DoNothing
+        }
+
+        return event.copy(start = filteredStart, stop = filteredStop)
     }
 
     private fun combineSettings():
@@ -344,7 +334,7 @@ class AutoTunnelService : LifecycleService() {
     private suspend fun handleAutoTunnelEvent(event: AutoTunnelEvent) {
         when (event) {
             is AutoTunnelEvent.Sync -> {
-                cancelNoInternetStopJob()
+
                 event.stop.forEach { tunnelId ->
                     Timber.d("Stopping tunnel: $tunnelId")
                     tunnelCoordinator.stopTunnel(tunnelId, TunnelActionSource.AUTO_TUNNEL)
@@ -355,12 +345,8 @@ class AutoTunnelService : LifecycleService() {
                     tunnelCoordinator.startTunnel(config, TunnelActionSource.AUTO_TUNNEL)
                 }
             }
-            AutoTunnelEvent.StopAllDueToNoInternet -> scheduleNoInternetStop()
+
             AutoTunnelEvent.DoNothing -> Unit
         }
     }
-
-    companion object {
-        private const val NO_INTERNET_GRACE_PERIOD_MS = 10_000L
-    }
 }

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

@@ -1,4 +1,4 @@
-package com.zaneschepke.wireguardautotunnel.service.autotunnel
+package com.zaneschepke.wireguardautotunnel.core.service.autotunnel
 
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow

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

@@ -1,9 +1,9 @@
-package com.zaneschepke.wireguardautotunnel.service.tile
+package com.zaneschepke.wireguardautotunnel.core.service.tile
 
 import android.service.quicksettings.Tile
 import android.service.quicksettings.TileService
 import com.zaneschepke.wireguardautotunnel.core.orchestration.AutoTunnelCoordinator
-import com.zaneschepke.wireguardautotunnel.service.autotunnel.AutoTunnelStateHolder
+import com.zaneschepke.wireguardautotunnel.core.service.autotunnel.AutoTunnelStateHolder
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job

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

@@ -1,4 +1,4 @@
-package com.zaneschepke.wireguardautotunnel.service.tile
+package com.zaneschepke.wireguardautotunnel.core.service.tile
 
 import android.content.ComponentName
 import android.content.Context

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

@@ -1,4 +1,4 @@
-package com.zaneschepke.wireguardautotunnel.service.tile
+package com.zaneschepke.wireguardautotunnel.core.service.tile
 
 import android.content.Context
 

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

@@ -1,4 +1,4 @@
-package com.zaneschepke.wireguardautotunnel.service.tile
+package com.zaneschepke.wireguardautotunnel.core.service.tile
 
 import android.os.Build
 import android.service.quicksettings.Tile

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

@@ -1,4 +1,4 @@
-package com.zaneschepke.wireguardautotunnel.service.tile
+package com.zaneschepke.wireguardautotunnel.core.service.tile
 
 import android.content.ComponentName
 import android.content.Context

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

@@ -1,116 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.core.tunnel
-
-import android.app.Notification
-import android.app.PendingIntent
-import android.content.Context
-import android.content.Intent
-import com.zaneschepke.tunnel.ApplicationProvider
-import com.zaneschepke.tunnel.model.BackendMode
-import com.zaneschepke.tunnel.state.BackendStatus
-import com.zaneschepke.wireguardautotunnel.MainActivity
-import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.domain.repository.TunnelRepository
-import com.zaneschepke.wireguardautotunnel.notification.AndroidNotificationService
-import com.zaneschepke.wireguardautotunnel.notification.NotificationService
-import com.zaneschepke.wireguardautotunnel.notification.NotificationService.Companion.PROXY_GROUP_KEY
-import com.zaneschepke.wireguardautotunnel.notification.NotificationService.Companion.VPN_GROUP_KEY
-import com.zaneschepke.wireguardautotunnel.notification.TunnelNotificationLine
-import com.zaneschepke.wireguardautotunnel.notification.TunnelNotificationService
-import com.zaneschepke.wireguardautotunnel.service.tile.TunnelTileRefresher
-import com.zaneschepke.wireguardautotunnel.ui.state.DisplayTunnelState
-import kotlinx.coroutines.flow.first
-
-class AndroidApplicationProvider(
-    private val notificationService: NotificationService,
-    private val tunnelNotificationService: TunnelNotificationService,
-    private val tunnelRepository: TunnelRepository,
-) : ApplicationProvider {
-
-    private val context: Context = notificationService.context
-
-    override fun refreshTile(context: Context) {
-        TunnelTileRefresher.refresh(context)
-    }
-
-    override fun createVpnConfigurePendingIntent(context: Context): PendingIntent {
-        return PendingIntent.getActivity(
-            context,
-            0,
-            Intent(context, MainActivity::class.java).apply {
-                addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP)
-            },
-            PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT,
-        )
-    }
-
-    override val vpnInitNotification: Notification
-        get() =
-            notificationService.createNotification(
-                channel = AndroidNotificationService.NotificationChannels.Tunnel.VPN,
-                title = context.getString(R.string.initializing),
-                onGoing = true,
-                groupKey = VPN_GROUP_KEY,
-            )
-
-    override val proxyInitNotification: Notification
-        get() =
-            notificationService.createNotification(
-                channel = AndroidNotificationService.NotificationChannels.Tunnel.Proxy,
-                title = context.getString(R.string.initializing),
-                onGoing = true,
-                groupKey = PROXY_GROUP_KEY,
-            )
-
-    override val vpnNotificationId: Int
-        get() = NotificationService.VPN_NOTIFICATION_ID
-
-    override val proxyNotificationId: Int
-        get() = NotificationService.PROXY_NOTIFICATION_ID
-
-    override suspend fun buildVpnPersistentNotification(
-        currentStatus: BackendStatus
-    ): Notification {
-        val lines = computeVpnNotificationLines(currentStatus)
-        return tunnelNotificationService.buildVpnPersistentNotification(lines)
-    }
-
-    override suspend fun buildProxyPersistentNotification(
-        currentStatus: BackendStatus
-    ): Notification {
-        val lines = computeProxyNotificationLines(currentStatus)
-        return tunnelNotificationService.buildProxyPersistentNotification(lines)
-    }
-
-    private suspend fun computeVpnNotificationLines(
-        status: BackendStatus
-    ): Map<Int, TunnelNotificationLine> {
-        val activeTunnels = status.activeTunnels
-        val allTunnels = tunnelRepository.userTunnelsFlow.first()
-        return activeTunnels
-            .mapNotNull { (id, activeTunnel) ->
-                val mode = activeTunnel.mode ?: return@mapNotNull null
-                if (mode !is BackendMode.Vpn && mode !is BackendMode.Proxy.KillSwitchPrimary)
-                    return@mapNotNull null
-                val tunnel = allTunnels.find { it.id == id } ?: return@mapNotNull null
-                val displayState = DisplayTunnelState.from(activeTunnel)
-                TunnelNotificationLine(id, tunnel.name, displayState)
-            }
-            .associateBy { it.id }
-    }
-
-    private suspend fun computeProxyNotificationLines(
-        status: BackendStatus
-    ): Map<Int, TunnelNotificationLine> {
-        val activeTunnels = status.activeTunnels
-        val allTunnels = tunnelRepository.userTunnelsFlow.first()
-        return activeTunnels
-            .mapNotNull { (id, activeTunnel) ->
-                val mode = activeTunnel.mode ?: return@mapNotNull null
-                if (mode !is BackendMode.Proxy.Standard) return@mapNotNull null
-                val tunnel = allTunnels.find { it.id == id } ?: return@mapNotNull null
-                val displayState = DisplayTunnelState.from(activeTunnel)
-                TunnelNotificationLine(id, tunnel.name, displayState)
-            }
-            .associateBy { it.id }
-    }
-}

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

@@ -6,9 +6,9 @@ import androidx.work.ExistingPeriodicWorkPolicy
 import androidx.work.PeriodicWorkRequestBuilder
 import androidx.work.WorkManager
 import androidx.work.WorkerParameters
+import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
+import com.zaneschepke.wireguardautotunnel.core.service.autotunnel.AutoTunnelStateHolder
 import com.zaneschepke.wireguardautotunnel.domain.repository.AutoTunnelSettingsRepository
-import com.zaneschepke.wireguardautotunnel.service.ServiceManager
-import com.zaneschepke.wireguardautotunnel.service.autotunnel.AutoTunnelStateHolder
 import java.util.concurrent.TimeUnit
 import timber.log.Timber
 

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

@@ -6,14 +6,14 @@ import android.os.StrictMode
 import com.zaneschepke.logcatter.LogReader
 import com.zaneschepke.logcatter.LogcatReader
 import com.zaneschepke.wireguardautotunnel.BuildConfig
+import com.zaneschepke.wireguardautotunnel.core.notification.AndroidNotificationService
+import com.zaneschepke.wireguardautotunnel.core.notification.NotificationService
+import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
+import com.zaneschepke.wireguardautotunnel.core.service.autotunnel.AutoTunnelStateHolder
 import com.zaneschepke.wireguardautotunnel.core.shortcut.DynamicShortcutManager
 import com.zaneschepke.wireguardautotunnel.core.shortcut.ShortcutManager
 import com.zaneschepke.wireguardautotunnel.domain.repository.GlobalEffectRepository
 import com.zaneschepke.wireguardautotunnel.domain.repository.SelectedTunnelsRepository
-import com.zaneschepke.wireguardautotunnel.notification.AndroidNotificationService
-import com.zaneschepke.wireguardautotunnel.notification.NotificationService
-import com.zaneschepke.wireguardautotunnel.service.ServiceManager
-import com.zaneschepke.wireguardautotunnel.service.autotunnel.AutoTunnelStateHolder
 import com.zaneschepke.wireguardautotunnel.util.FileUtils
 import com.zaneschepke.wireguardautotunnel.util.network.NetworkUtils
 import com.zaneschepke.wireguardautotunnel.viewmodel.AutoTunnelViewModel

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

@@ -1,19 +1,25 @@
 package com.zaneschepke.wireguardautotunnel.di
 
+import android.app.Notification
+import android.content.Context
 import com.zaneschepke.networkmonitor.AndroidNetworkMonitor
 import com.zaneschepke.networkmonitor.NetworkMonitor
 import com.zaneschepke.networkmonitor.StableNetworkEngine
-import com.zaneschepke.tunnel.ApplicationProvider
-import com.zaneschepke.tunnel.util.RootShell
+import com.zaneschepke.tunnel.NotificationProvider
+import com.zaneschepke.tunnel.backend.RootShell
 import com.zaneschepke.tunnel.util.RootShellException
+import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.core.event.TunnelEventDispatcher
-import com.zaneschepke.wireguardautotunnel.core.tunnel.AndroidApplicationProvider
+import com.zaneschepke.wireguardautotunnel.core.notification.AndroidNotificationService.NotificationChannels
+import com.zaneschepke.wireguardautotunnel.core.notification.AndroidTunnelNotificationService
+import com.zaneschepke.wireguardautotunnel.core.notification.NotificationService
+import com.zaneschepke.wireguardautotunnel.core.notification.NotificationService.Companion.PROXY_GROUP_KEY
+import com.zaneschepke.wireguardautotunnel.core.notification.NotificationService.Companion.VPN_GROUP_KEY
+import com.zaneschepke.wireguardautotunnel.core.notification.TunnelNotificationService
+import com.zaneschepke.wireguardautotunnel.core.service.tile.TunnelTileRefresher
 import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelBackendProvider
 import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelProvider
 import com.zaneschepke.wireguardautotunnel.domain.repository.AutoTunnelSettingsRepository
-import com.zaneschepke.wireguardautotunnel.lifecyle.AppVisibilityObserver
-import com.zaneschepke.wireguardautotunnel.notification.AndroidTunnelNotificationService
-import com.zaneschepke.wireguardautotunnel.notification.TunnelNotificationService
 import com.zaneschepke.wireguardautotunnel.util.extensions.to
 import kotlin.time.Duration.Companion.milliseconds
 import kotlinx.coroutines.CoroutineScope
@@ -30,15 +36,40 @@ import timber.log.Timber
 
 val tunnelBackendProviderModule = module {
     single<TunnelNotificationService> { AndroidTunnelNotificationService(get()) }
-    single { AppVisibilityObserver() }
     singleOf(::TunnelEventDispatcher)
 
-    single<ApplicationProvider> {
-        AndroidApplicationProvider(
-            notificationService = get(),
-            tunnelNotificationService = get(),
-            tunnelRepository = get(),
-        )
+    single<NotificationProvider> {
+        val notificationService = get<NotificationService>()
+        val context = androidContext()
+        object : NotificationProvider {
+            override val vpnInitNotification: Notification
+                get() =
+                    notificationService.createNotification(
+                        channel = NotificationChannels.Tunnel.VPN,
+                        title = context.getString(R.string.initializing),
+                        onGoing = true,
+                        groupKey = VPN_GROUP_KEY,
+                    )
+
+            override val proxyInitNotification: Notification
+                get() =
+                    notificationService.createNotification(
+                        channel = NotificationChannels.Tunnel.Proxy,
+                        title = context.getString(R.string.initializing),
+                        onGoing = true,
+                        groupKey = PROXY_GROUP_KEY,
+                    )
+
+            override val vpnNotificationId: Int
+                get() = NotificationService.VPN_NOTIFICATION_ID
+
+            override val proxyNotificationId: Int
+                get() = NotificationService.PROXY_NOTIFICATION_ID
+
+            override fun refreshTile(context: Context) {
+                TunnelTileRefresher.refresh(context)
+            }
+        }
     }
 
     single {

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

@@ -7,6 +7,4 @@ sealed interface AutoTunnelEvent {
     data class Sync(val start: Set<TunnelConfig>, val stop: Set<Int>) : AutoTunnelEvent
 
     data object DoNothing : AutoTunnelEvent
-
-    data object StopAllDueToNoInternet : AutoTunnelEvent
 }

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

@@ -4,12 +4,7 @@ import com.zaneschepke.wireguardautotunnel.domain.enums.TunnelActionSource
 
 sealed interface TunnelActionEvent {
 
-    val source: TunnelActionSource
-    val tunnelId: Int
+    data class Started(val tunnelId: Int, val source: TunnelActionSource) : TunnelActionEvent
 
-    data class Started(override val tunnelId: Int, override val source: TunnelActionSource) :
-        TunnelActionEvent
-
-    data class Stopped(override val tunnelId: Int, override val source: TunnelActionSource) :
-        TunnelActionEvent
+    data class Stopped(val tunnelId: Int, val source: TunnelActionSource) : TunnelActionEvent
 }

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

@@ -7,7 +7,7 @@ import kotlinx.coroutines.flow.asSharedFlow
 class GlobalEffectRepository {
 
     private val _globalEffectFlow =
-        MutableSharedFlow<GlobalSideEffect>(replay = 0, extraBufferCapacity = 0)
+        MutableSharedFlow<GlobalSideEffect>(replay = 0, extraBufferCapacity = 1)
     val flow = _globalEffectFlow.asSharedFlow()
 
     suspend fun post(effect: GlobalSideEffect) {

app/src/main/java/com/zaneschepke/wireguardautotunnel/domain/sideeffect/GlobalSideEffect.kt

@@ -1,8 +1,8 @@
 package com.zaneschepke.wireguardautotunnel.domain.sideeffect
 
-import com.dokar.sonner.ToastType
 import com.zaneschepke.wireguardautotunnel.domain.enums.TunnelMode
 import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConfig
+import com.zaneschepke.wireguardautotunnel.ui.common.snackbar.SnackbarType
 import com.zaneschepke.wireguardautotunnel.util.StringValue
 import java.io.File
 
@@ -10,12 +10,14 @@ sealed class GlobalSideEffect {
 
     data class Snackbar(
         val message: StringValue,
-        val type: ToastType,
+        val type: SnackbarType? = null,
         val actionLabel: String? = null,
         val onAction: (() -> Unit)? = null,
         val durationMs: Long? = null,
     ) : GlobalSideEffect()
 
+    data class Toast(val message: StringValue) : GlobalSideEffect()
+
     data object PopBackStack : GlobalSideEffect()
 
     data class LaunchUrl(val url: String) : GlobalSideEffect()

app/src/main/java/com/zaneschepke/wireguardautotunnel/lifecyle/AppVisibilityObserver.kt

@@ -1,26 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.lifecyle
-
-import androidx.lifecycle.DefaultLifecycleObserver
-import androidx.lifecycle.LifecycleOwner
-import androidx.lifecycle.ProcessLifecycleOwner
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.flow.asStateFlow
-
-class AppVisibilityObserver : DefaultLifecycleObserver {
-
-    private val _isForeground = MutableStateFlow(false)
-    val isForeground: StateFlow<Boolean> = _isForeground.asStateFlow()
-
-    init {
-        ProcessLifecycleOwner.get().lifecycle.addObserver(this)
-    }
-
-    override fun onStart(owner: LifecycleOwner) {
-        _isForeground.value = true
-    }
-
-    override fun onStop(owner: LifecycleOwner) {
-        _isForeground.value = false
-    }
-}

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

@@ -0,0 +1,104 @@
+package com.zaneschepke.wireguardautotunnel.ui.common.snackbar
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.IntrinsicSize
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+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.layout.width
+import androidx.compose.foundation.layout.wrapContentHeight
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.Favorite
+import androidx.compose.material.icons.rounded.Close
+import androidx.compose.material.icons.rounded.Info
+import androidx.compose.material.icons.rounded.Warning
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Snackbar
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.dp
+import com.zaneschepke.wireguardautotunnel.R
+import com.zaneschepke.wireguardautotunnel.ui.LocalIsAndroidTV
+
+@Composable
+fun CustomSnackBar(
+    message: AnnotatedString,
+    onDismiss: () -> Unit,
+    modifier: Modifier = Modifier,
+    type: SnackbarType = SnackbarType.INFO,
+    containerColor: Color = MaterialTheme.colorScheme.surface,
+) {
+    val isTv = LocalIsAndroidTV.current
+    val icon =
+        when (type) {
+            SnackbarType.INFO -> Icons.Rounded.Info
+            SnackbarType.WARNING -> Icons.Rounded.Warning
+            SnackbarType.THANK_YOU -> Icons.Outlined.Favorite
+        }
+    val iconDescription =
+        when (type) {
+            SnackbarType.INFO -> stringResource(R.string.info)
+            SnackbarType.WARNING -> stringResource(R.string.warning)
+            SnackbarType.THANK_YOU -> stringResource(R.string.thank_you)
+        }
+
+    Snackbar(
+        containerColor = containerColor,
+        modifier =
+            modifier
+                .wrapContentHeight(align = Alignment.Top)
+                .padding(horizontal = if (isTv) 48.dp else 16.dp),
+        shape = RoundedCornerShape(16.dp),
+    ) {
+        Row(
+            modifier =
+                Modifier.fillMaxWidth()
+                    .height(IntrinsicSize.Min)
+                    .width(IntrinsicSize.Min)
+                    .padding(vertical = 16.dp),
+            verticalAlignment = Alignment.CenterVertically,
+            horizontalArrangement = Arrangement.SpaceBetween,
+        ) {
+            Row(
+                modifier = Modifier.fillMaxWidth().weight(1f),
+                verticalAlignment = Alignment.CenterVertically,
+                horizontalArrangement = Arrangement.Start,
+            ) {
+                Icon(
+                    icon,
+                    contentDescription = iconDescription,
+                    tint = MaterialTheme.colorScheme.onSurface,
+                )
+                Spacer(modifier = Modifier.width(16.dp))
+                Text(
+                    text = message,
+                    color = MaterialTheme.colorScheme.onSurface,
+                    maxLines = 8,
+                    overflow = TextOverflow.Ellipsis,
+                )
+            }
+
+            Row {
+                IconButton(onClick = onDismiss, modifier = Modifier.size(24.dp)) {
+                    Icon(
+                        Icons.Rounded.Close,
+                        contentDescription = stringResource(R.string.stop),
+                        tint = MaterialTheme.colorScheme.onSurfaceVariant,
+                    )
+                }
+            }
+        }
+    }
+}

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

@@ -0,0 +1,76 @@
+package com.zaneschepke.wireguardautotunnel.ui.common.snackbar
+
+import androidx.compose.foundation.layout.Box
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import kotlinx.coroutines.channels.Channel
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
+
+@Composable
+fun rememberCustomSnackbarState(): CustomSnackbarState {
+    return remember { CustomSnackbarState() }
+}
+
+class CustomSnackbarState {
+    private val _snackbars = Channel<SnackbarInfo>(Channel.BUFFERED)
+    val snackbars: Channel<SnackbarInfo> = _snackbars
+
+    private var currentSnackbar by mutableStateOf<SnackbarInfo?>(null)
+    private var isShowing by mutableStateOf(false)
+
+    fun showSnackbar(info: SnackbarInfo) {
+        _snackbars.trySend(info)
+    }
+
+    fun dismissCurrent() {
+        currentSnackbar = null
+        isShowing = false
+    }
+
+    @Composable
+    fun SnackbarHost(
+        modifier: Modifier = Modifier,
+        snackbar: @Composable (SnackbarInfo) -> Unit = { info ->
+            CustomSnackBar(
+                message = info.message,
+                type = info.type,
+                onDismiss = { dismissCurrent() },
+                modifier = Modifier,
+                containerColor = MaterialTheme.colorScheme.surface.copy(.1f),
+            )
+        },
+    ) {
+        val scope = rememberCoroutineScope()
+        LaunchedEffect(Unit) {
+            for (info in snackbars) {
+                currentSnackbar = info
+                isShowing = true
+
+                scope.launch {
+                    delay(info.durationMs)
+                    if (currentSnackbar?.id == info.id) {
+                        dismissCurrent()
+                    }
+                }
+
+                while (isShowing && currentSnackbar?.id == info.id) {
+                    delay(100)
+                }
+            }
+        }
+
+        currentSnackbar?.let { info ->
+            if (isShowing) {
+                Box(modifier = modifier) { snackbar(info) }
+            }
+        }
+    }
+}

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

@@ -0,0 +1,16 @@
+package com.zaneschepke.wireguardautotunnel.ui.common.snackbar
+
+import androidx.compose.ui.text.AnnotatedString
+
+enum class SnackbarType {
+    INFO,
+    WARNING,
+    THANK_YOU,
+}
+
+data class SnackbarInfo(
+    val message: AnnotatedString,
+    val type: SnackbarType = SnackbarType.INFO,
+    val durationMs: Long = 4000L,
+    val id: String = System.currentTimeMillis().toString(),
+)

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

@@ -1,18 +1,13 @@
 package com.zaneschepke.wireguardautotunnel.ui.common.textbox
 
-import androidx.compose.foundation.background
 import androidx.compose.foundation.interaction.MutableInteractionSource
-import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.defaultMinSize
 import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.offset
-import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.text.KeyboardActions
 import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.text.input.KeyboardCapitalization
@@ -34,59 +29,48 @@ fun ConfigurationTextBox(
     leading: (@Composable () -> Unit)? = null,
     trailing: (@Composable (Modifier) -> Unit)? = null,
     supportingText: (@Composable () -> Unit)? = null,
-    interactionSource: MutableInteractionSource = remember { MutableInteractionSource() },
+    interactionSource: MutableInteractionSource = MutableInteractionSource(),
     visualTransformation: VisualTransformation = VisualTransformation.None,
     enabled: Boolean = true,
     readOnly: Boolean = false,
     singleLine: Boolean = true,
 ) {
-    Box(modifier = modifier.padding(top = 6.dp)) {
-        CustomTextField(
-            isError = isError,
-            textStyle =
-                MaterialTheme.typography.bodySmall.copy(
-                    color = MaterialTheme.colorScheme.onSurface
-                ),
-            modifier = Modifier.fillMaxWidth().defaultMinSize(minHeight = 48.dp),
-            value = value,
-            visualTransformation = visualTransformation,
-            singleLine = singleLine,
-            interactionSource = interactionSource,
-            onValueChange = onValueChange,
-            label = null, // Disable built in label
-            containerColor = MaterialTheme.colorScheme.surface,
-            placeholder = {
-                Text(
-                    text = hint,
-                    style = MaterialTheme.typography.bodySmall,
-                    color = MaterialTheme.colorScheme.outline,
-                    overflow = TextOverflow.Ellipsis,
-                    maxLines = 1,
-                )
-            },
-            keyboardOptions = keyboardOptions,
-            keyboardActions = keyboardActions,
-            trailing = trailing,
-            supportingText = supportingText,
-            leading = leading,
-            readOnly = readOnly,
-            enabled = enabled,
-        )
 
-        // custom static label notch
-        if (label.isNotEmpty()) {
+    CustomTextField(
+        isError = isError,
+        textStyle =
+            MaterialTheme.typography.bodySmall.copy(color = MaterialTheme.colorScheme.onSurface),
+        modifier = modifier.fillMaxWidth().defaultMinSize(minHeight = 48.dp),
+        value = value,
+        visualTransformation = visualTransformation,
+        singleLine = singleLine,
+        interactionSource = interactionSource,
+        onValueChange = { onValueChange(it) },
+        label = {
             Text(
-                text = label,
+                label,
                 color = MaterialTheme.colorScheme.onSurface,
-                style = MaterialTheme.typography.labelSmall,
+                style = MaterialTheme.typography.labelMedium,
                 overflow = TextOverflow.Ellipsis,
                 maxLines = 1,
-                modifier =
-                    Modifier.padding(start = 12.dp)
-                        .offset(y = (-8).dp)
-                        .background(MaterialTheme.colorScheme.surface)
-                        .padding(horizontal = 4.dp),
             )
-        }
-    }
+        },
+        containerColor = MaterialTheme.colorScheme.surface,
+        placeholder = {
+            Text(
+                hint,
+                style = MaterialTheme.typography.bodySmall,
+                color = MaterialTheme.colorScheme.outline,
+                overflow = TextOverflow.Ellipsis,
+                maxLines = 1,
+            )
+        },
+        keyboardOptions = keyboardOptions,
+        keyboardActions = keyboardActions,
+        trailing = trailing,
+        supportingText = supportingText,
+        leading = leading,
+        readOnly = readOnly,
+        enabled = enabled,
+    )
 }

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

@@ -22,9 +22,7 @@ import androidx.compose.ui.focus.focusRequester
 import androidx.compose.ui.focus.onFocusChanged
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.SolidColor
-import androidx.compose.ui.text.TextRange
 import androidx.compose.ui.text.TextStyle
-import androidx.compose.ui.text.input.TextFieldValue
 import androidx.compose.ui.text.input.VisualTransformation
 import androidx.compose.ui.unit.dp
 
@@ -35,7 +33,7 @@ fun CustomTextField(
     modifier: Modifier = Modifier,
     textStyle: TextStyle =
         MaterialTheme.typography.bodyLarge.copy(color = MaterialTheme.colorScheme.onSurface),
-    label: @Composable (() -> Unit)? = null,
+    label: @Composable () -> Unit,
     containerColor: Color,
     onValueChange: (value: String) -> Unit = {},
     singleLine: Boolean = true,
@@ -49,19 +47,10 @@ fun CustomTextField(
     readOnly: Boolean = false,
     enabled: Boolean = true,
     visualTransformation: VisualTransformation = VisualTransformation.None,
-    interactionSource: MutableInteractionSource = remember { MutableInteractionSource() },
+    interactionSource: MutableInteractionSource = MutableInteractionSource(),
 ) {
+    val space = " "
     var isFocused by remember { mutableStateOf(false) }
-    var textFieldValueState by remember { mutableStateOf(TextFieldValue(text = value)) }
-    val textFieldValue =
-        remember(value, textFieldValueState) {
-            if (textFieldValueState.text == value) {
-                textFieldValueState
-            } else {
-                textFieldValueState.copy(text = value, selection = TextRange(value.length))
-            }
-        }
-
     val cursorBrush =
         if (isFocused) SolidColor(MaterialTheme.colorScheme.primary)
         else SolidColor(Color.Transparent)
@@ -78,14 +67,9 @@ fun CustomTextField(
         }
 
     BasicTextField(
-        value = textFieldValue,
+        value = value,
         textStyle = effectiveTextStyle,
-        onValueChange = { newTextFieldValue ->
-            textFieldValueState = newTextFieldValue
-            if (value != newTextFieldValue.text) {
-                onValueChange(newTextFieldValue.text)
-            }
-        },
+        onValueChange = { onValueChange(it) },
         keyboardActions = keyboardActions,
         keyboardOptions = keyboardOptions,
         readOnly = readOnly,
@@ -106,9 +90,15 @@ fun CustomTextField(
         visualTransformation = visualTransformation,
     ) {
         OutlinedTextFieldDefaults.DecorationBox(
-            value = value,
-            innerTextField = it,
-            placeholder = placeholder,
+            value = space + value,
+            innerTextField = {
+                if (value.isEmpty()) {
+                    if (placeholder != null) {
+                        placeholder()
+                    }
+                }
+                it.invoke()
+            },
             contentPadding = OutlinedTextFieldDefaults.contentPadding(top = 14.dp, bottom = 14.dp),
             leadingIcon = leading,
             trailingIcon =
@@ -151,6 +141,7 @@ fun CustomTextField(
             label = label,
             visualTransformation = visualTransformation,
             interactionSource = interactionSource,
+            placeholder = placeholder,
             container = {
                 OutlinedTextFieldDefaults.Container(
                     enabled = enabled,

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

@@ -42,12 +42,7 @@ sealed class Route : NavKey {
 
     @Keep @Serializable data object Display : Route()
 
-    @Keep
-    @Serializable
-    data object Tunnels : Route(), SecureRoute {
-        override val requiresProtection: Boolean
-            get() = true
-    }
+    @Keep @Serializable data object Tunnels : Route()
 
     @Keep @Serializable data class TunnelSettings(val id: Int) : Route()
 

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/navigation/components/currentBackStackEntryAsNavbarState.kt

@@ -250,7 +250,7 @@ fun currentRouteAsNavbarState(
                     val global = route !is ConfigEdit
                     val tunnelName =
                         if (!global) globalState.tunnelNames[route.id]
-                        else context.getString(R.string.tunnel_configuration)
+                        else context.getString(R.string.configuration_globals)
                     NavbarState(
                         topLeading = { TvBackButton { navController.pop() } },
                         showBottomItems = true,
@@ -297,7 +297,7 @@ fun currentRouteAsNavbarState(
                 is SplitTunnelGlobal -> {
                     val tunnelName =
                         if (route is SplitTunnel) globalState.tunnelNames[route.id]
-                        else context.getString(R.string.splt_tunneling)
+                        else context.getString(R.string.global_split_tunneling)
                     NavbarState(
                         topLeading = { TvBackButton { navController.pop() } },
                         topTitle = tunnelName ?: "",

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

@@ -302,9 +302,7 @@ fun AutoTunnelScreen(
             SurfaceRow(
                 leading = { Icon(Icons.Outlined.PublicOff, contentDescription = null) },
                 title = stringResource(R.string.stop_on_no_internet),
-                description = {
-                    DescriptionText(stringResource(R.string.stop_on_no_internet_desc))
-                },
+                description = { DescriptionText(stringResource(R.string.stop_on_internet_loss)) },
                 trailing = {
                     ThemedSwitch(
                         checked = uiState.autoTunnelSettings.isStopOnNoInternetEnabled,
@@ -320,7 +318,7 @@ fun AutoTunnelScreen(
         }
         Column {
             GroupLabel(
-                stringResource(R.string.automation),
+                stringResource(R.string.other),
                 modifier = Modifier.padding(horizontal = 16.dp),
             )
             SurfaceRow(
@@ -332,7 +330,6 @@ fun AutoTunnelScreen(
                         onClick = { viewModel.setStartAtBoot(it) },
                     )
                 },
-                description = { DescriptionText(stringResource(R.string.start_on_boot_desc)) },
                 onClick = { viewModel.setStartAtBoot(!uiState.autoTunnelSettings.startOnBoot) },
             )
         }

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

@@ -9,7 +9,6 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.res.stringResource
-import com.dokar.sonner.ToastType
 import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.ui.LocalNavController
 import com.zaneschepke.wireguardautotunnel.ui.navigation.Route
@@ -46,17 +45,11 @@ fun PinLockScreen(sharedViewModel: SharedAppViewModel = koinActivityViewModel())
         textColor = MaterialTheme.colorScheme.onSurface,
         onPinCorrect = { onPinCorrect() },
         onPinIncorrect = {
-            sharedViewModel.showSnackMessage(
-                StringValue.StringResource(R.string.incorrect_pin),
-                ToastType.Warning,
-            )
+            sharedViewModel.showToast(StringValue.StringResource(R.string.incorrect_pin))
         },
         onPinCreated = {
             pinCreated = true
-            sharedViewModel.showSnackMessage(
-                StringValue.StringResource(R.string.pin_created),
-                ToastType.Success,
-            )
+            sharedViewModel.showToast(StringValue.StringResource(R.string.pin_created))
             sharedViewModel.setPinLockEnabled(true)
             onPinCorrect()
         },

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

@@ -38,7 +38,6 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.res.vectorResource
 import androidx.compose.ui.text.intl.Locale
 import androidx.compose.ui.unit.dp
-import com.dokar.sonner.ToastType
 import com.zaneschepke.wireguardautotunnel.MainActivity
 import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.domain.enums.TunnelMode
@@ -52,12 +51,12 @@ import com.zaneschepke.wireguardautotunnel.ui.common.label.GroupLabel
 import com.zaneschepke.wireguardautotunnel.ui.common.text.DescriptionText
 import com.zaneschepke.wireguardautotunnel.ui.navigation.Route
 import com.zaneschepke.wireguardautotunnel.ui.screens.settings.components.BackupBottomSheet
-import com.zaneschepke.wireguardautotunnel.ui.screens.settings.components.BackupEncryptionDialog
 import com.zaneschepke.wireguardautotunnel.ui.screens.settings.proxy.compoents.AppModeBottomSheet
 import com.zaneschepke.wireguardautotunnel.util.StringValue
 import com.zaneschepke.wireguardautotunnel.util.extensions.asString
 import com.zaneschepke.wireguardautotunnel.util.extensions.asTitleString
 import com.zaneschepke.wireguardautotunnel.util.extensions.capitalize
+import com.zaneschepke.wireguardautotunnel.util.extensions.showToast
 import com.zaneschepke.wireguardautotunnel.viewmodel.SettingsViewModel
 import com.zaneschepke.wireguardautotunnel.viewmodel.SharedAppViewModel
 import org.koin.androidx.compose.koinViewModel
@@ -89,9 +88,6 @@ fun SettingsScreen(
     }
 
     var showBackupSheet by rememberSaveable { mutableStateOf(false) }
-    var showEncryptionDialog by rememberSaveable { mutableStateOf(false) }
-    var isRestoreAction by remember { mutableStateOf(false) }
-
     var showAppModeSheet by rememberSaveable { mutableStateOf(false) }
 
     val appMode = uiState.settings.tunnelMode
@@ -103,53 +99,19 @@ fun SettingsScreen(
         }
 
     fun performBackupRestore(action: () -> Unit) {
+        if (uiState.tunnelActive || globalUiState.isAutoTunnelActive)
+            return context.showToast(R.string.all_services_disabled)
         showBackupSheet = false
-        if (uiState.tunnelActive || globalUiState.isAutoTunnelActive) {
-            sharedViewModel.showSnackMessage(
-                StringValue.StringResource(R.string.all_services_disabled),
-                ToastType.Warning,
-            )
-            return
-        }
         action()
     }
 
-    if (showBackupSheet) {
+    if (showBackupSheet)
         BackupBottomSheet(
-            onBackup = {
-                showBackupSheet = false
-                isRestoreAction = false
-                showEncryptionDialog = true
-            },
-            onRestore = {
-                showBackupSheet = false
-                isRestoreAction = true
-                showEncryptionDialog = true
-            },
-            onDismiss = { showBackupSheet = false },
-        )
-    }
-
-    if (showEncryptionDialog) {
-        BackupEncryptionDialog(
-            isRestore = isRestoreAction,
-            onConfirm = { encrypt, password ->
-                showEncryptionDialog = false
-
-                if (isRestoreAction) {
-                    performBackupRestore {
-                        (context as? MainActivity)?.performRestore(encrypt, password)
-                    }
-                } else {
-                    performBackupRestore {
-                        (context as? MainActivity)?.performBackup(encrypt, password)
-                    }
-                }
-            },
-            onDismiss = { showEncryptionDialog = false },
-        )
-    }
-
+            { performBackupRestore { (context as? MainActivity)?.performBackup() } },
+            { performBackupRestore { (context as? MainActivity)?.performRestore() } },
+        ) {
+            showBackupSheet = false
+        }
     if (showAppModeSheet)
         AppModeBottomSheet(sharedViewModel::setAppMode, uiState.settings.tunnelMode) {
             showAppModeSheet = false
@@ -206,8 +168,7 @@ fun SettingsScreen(
                             StringValue.StringResource(
                                 R.string.mode_disabled_template,
                                 appMode.asString(context),
-                            ),
-                            ToastType.Info,
+                            )
                         )
                 },
             )
@@ -215,7 +176,6 @@ fun SettingsScreen(
                 leading = { Icon(Icons.Outlined.Public, contentDescription = null) },
                 title = stringResource(R.string.tunnel_globals),
                 onClick = { navController.push(Route.TunnelGlobals) },
-                description = { DescriptionText(stringResource(R.string.tunnel_globals_desc)) },
             )
             SurfaceRow(
                 leading = { Icon(Icons.Outlined.Terminal, contentDescription = null) },
@@ -272,7 +232,6 @@ fun SettingsScreen(
                         modifier = modifier,
                     )
                 },
-                description = { DescriptionText(stringResource(R.string.local_logging_desc)) },
                 onClick = { navController.push(Route.Logs) },
             )
             SurfaceRow(

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

@@ -1,146 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.ui.screens.settings.components
-
-import androidx.compose.foundation.layout.*
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.outlined.Visibility
-import androidx.compose.material.icons.outlined.VisibilityOff
-import androidx.compose.material3.Icon
-import androidx.compose.material3.IconButton
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Text
-import androidx.compose.runtime.*
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.input.PasswordVisualTransformation
-import androidx.compose.ui.text.input.VisualTransformation
-import androidx.compose.ui.unit.dp
-import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.ui.common.button.ThemedSwitch
-import com.zaneschepke.wireguardautotunnel.ui.common.dialog.InfoDialog
-import com.zaneschepke.wireguardautotunnel.ui.common.textbox.CustomTextField
-
-@Composable
-fun BackupEncryptionDialog(
-    isRestore: Boolean,
-    onConfirm: (encrypt: Boolean, password: String?) -> Unit,
-    onDismiss: () -> Unit,
-) {
-    var encrypt by remember { mutableStateOf(false) }
-    var password by remember { mutableStateOf("") }
-    var confirmPassword by remember { mutableStateOf("") }
-    var showPasswordError by remember { mutableStateOf(false) }
-    var passwordVisible by remember { mutableStateOf(false) }
-    var confirmPasswordVisible by remember { mutableStateOf(false) }
-
-    InfoDialog(
-        title =
-            if (isRestore) {
-                stringResource(R.string.restore)
-            } else {
-                stringResource(R.string.backup)
-            },
-        confirmText =
-            if (isRestore) {
-                stringResource(R.string.restore)
-            } else {
-                stringResource(R.string.backup)
-            },
-        onAttest = {
-            if (!isRestore && encrypt && password != confirmPassword) {
-                showPasswordError = true
-                return@InfoDialog
-            }
-            if (encrypt && password.isBlank()) {
-                return@InfoDialog
-            }
-
-            val finalPassword = if (encrypt) password else null
-            onConfirm(encrypt, finalPassword)
-        },
-        onDismiss = onDismiss,
-        body = {
-            Column(
-                verticalArrangement = Arrangement.spacedBy(16.dp),
-                modifier = Modifier.fillMaxWidth(),
-            ) {
-                Row(
-                    modifier = Modifier.fillMaxWidth(),
-                    horizontalArrangement = Arrangement.SpaceBetween,
-                    verticalAlignment = Alignment.CenterVertically,
-                ) {
-                    Text(stringResource(R.string.encrypted))
-                    ThemedSwitch(checked = encrypt, onClick = { encrypt = it })
-                }
-
-                if (encrypt) {
-                    CustomTextField(
-                        value = password,
-                        onValueChange = {
-                            password = it
-                            showPasswordError = false
-                        },
-                        containerColor = MaterialTheme.colorScheme.surface,
-                        label = { Text(stringResource(R.string.password)) },
-                        visualTransformation =
-                            if (passwordVisible) VisualTransformation.None
-                            else PasswordVisualTransformation(),
-                        trailing = {
-                            IconButton(onClick = { passwordVisible = !passwordVisible }) {
-                                Icon(
-                                    imageVector =
-                                        if (passwordVisible) Icons.Outlined.VisibilityOff
-                                        else Icons.Outlined.Visibility,
-                                    contentDescription =
-                                        if (passwordVisible) stringResource(R.string.hide_password)
-                                        else stringResource(R.string.show_password),
-                                )
-                            }
-                        },
-                        modifier = Modifier.fillMaxWidth(),
-                    )
-
-                    if (!isRestore) {
-                        CustomTextField(
-                            value = confirmPassword,
-                            onValueChange = {
-                                confirmPassword = it
-                                showPasswordError = false
-                            },
-                            label = { Text(stringResource(R.string.confirm_password)) },
-                            visualTransformation =
-                                if (confirmPasswordVisible) VisualTransformation.None
-                                else PasswordVisualTransformation(),
-                            trailing = {
-                                IconButton(
-                                    onClick = { confirmPasswordVisible = !confirmPasswordVisible }
-                                ) {
-                                    Icon(
-                                        imageVector =
-                                            if (confirmPasswordVisible) Icons.Outlined.VisibilityOff
-                                            else Icons.Outlined.Visibility,
-                                        contentDescription =
-                                            if (confirmPasswordVisible)
-                                                stringResource(R.string.hide_password)
-                                            else stringResource(R.string.show_password),
-                                    )
-                                }
-                            },
-                            containerColor = MaterialTheme.colorScheme.surface,
-                            modifier = Modifier.fillMaxWidth(),
-                            isError = showPasswordError,
-                        )
-                    }
-
-                    if (showPasswordError) {
-                        Text(
-                            text = stringResource(R.string.passwords_do_not_match),
-                            color = MaterialTheme.colorScheme.error,
-                            style = MaterialTheme.typography.bodySmall,
-                        )
-                    }
-                }
-            }
-        },
-    )
-}

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

@@ -56,7 +56,7 @@ fun TunnelGlobalsScreen(
                 )
             },
             enabled = sharedUiState.tunnelMode != TunnelMode.PROXY,
-            title = stringResource(R.string.splt_tunneling),
+            title = stringResource(R.string.global_split_tunneling),
             trailing = { modifier ->
                 SwitchWithDivider(
                     checked = uiState.settings.isGlobalSplitTunnelEnabled,
@@ -82,7 +82,7 @@ fun TunnelGlobalsScreen(
         )
         SurfaceRow(
             leading = { Icon(Icons.Outlined.Description, contentDescription = null) },
-            title = stringResource(R.string.tunnel_configuration),
+            title = stringResource(R.string.configuration_globals),
             onClick = {
                 uiState.globalTunnelConfig?.let {
                     navController.push(Route.ConfigGlobal(id = it.id))

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

@@ -11,7 +11,7 @@ import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.outlined.Launch
 import androidx.compose.material.icons.filled.AppShortcut
-import androidx.compose.material.icons.filled.SettingsRemote
+import androidx.compose.material.icons.filled.SmartToy
 import androidx.compose.material.icons.outlined.AdminPanelSettings
 import androidx.compose.material.icons.outlined.ContentCopy
 import androidx.compose.material.icons.outlined.Key
@@ -133,22 +133,20 @@ fun AndroidIntegrationsScreen(viewModel: SettingsViewModel = koinViewModel()) {
                         onClick = { viewModel.setShortcutsEnabled(it) },
                     )
                 },
-                title = stringResource(R.string.app_shortcuts),
-                description = { DescriptionText(stringResource(R.string.app_shortcuts_desc)) },
+                title = stringResource(R.string.enabled_app_shortcuts),
                 onClick = {
                     viewModel.setShortcutsEnabled(!settingsState.settings.isShortcutsEnabled)
                 },
             )
             SurfaceRow(
-                leading = { Icon(Icons.Filled.SettingsRemote, contentDescription = null) },
+                leading = { Icon(Icons.Filled.SmartToy, contentDescription = null) },
                 trailing = {
                     ThemedSwitch(
                         checked = settingsState.isRemoteEnabled,
                         onClick = { viewModel.setRemoteEnabled(it) },
                     )
                 },
-                title = stringResource(R.string.remote_control),
-                description = { DescriptionText(stringResource(R.string.remote_control_desc)) },
+                title = stringResource(R.string.enable_remote_app_control),
                 onClick = { viewModel.setRemoteEnabled(!settingsState.isRemoteEnabled) },
             )
             AnimatedVisibility(settingsState.isRemoteEnabled) {

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

@@ -12,7 +12,6 @@ import androidx.compose.runtime.setValue
 import androidx.compose.runtime.snapshotFlow
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
-import com.dokar.sonner.ToastType
 import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.ui.screens.settings.logs.components.LogList
 import com.zaneschepke.wireguardautotunnel.ui.screens.settings.logs.components.LogsBottomSheet
@@ -87,15 +86,13 @@ fun LogsScreen(
             },
             onCanceled = {
                 sharedViewModel.showSnackMessage(
-                    StringValue.StringResource(R.string.export_canceled),
-                    ToastType.Warning,
+                    StringValue.StringResource(R.string.export_canceled)
                 )
                 showLogsSheet = false
             },
             onUnsupported = {
                 sharedViewModel.showSnackMessage(
-                    StringValue.StringResource(R.string.export_unsupported),
-                    ToastType.Warning,
+                    StringValue.StringResource(R.string.export_unsupported)
                 )
                 showLogsSheet = false
             },

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/settings/logs/components/LogList.kt

@@ -1,12 +1,10 @@
 package com.zaneschepke.wireguardautotunnel.ui.screens.settings.logs.components
 
-import androidx.compose.foundation.gestures.Orientation
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.foundation.lazy.itemsIndexed
-import androidx.compose.material3.scrollbar
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
@@ -20,13 +18,7 @@ fun LogList(
 ) {
     LazyColumn(
         state = lazyColumnListState,
-        modifier =
-            modifier
-                .padding(horizontal = 12.dp)
-                .scrollbar(
-                    state = lazyColumnListState.scrollIndicatorState,
-                    orientation = Orientation.Vertical,
-                ),
+        modifier = modifier.padding(horizontal = 12.dp),
         verticalArrangement = Arrangement.spacedBy(2.dp),
     ) {
         itemsIndexed(items = logs, key = { index, _ -> index }) { _, log -> LogItem(log = log) }

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/settings/proxy/compoents/AppModeBottomSheet.kt

@@ -2,8 +2,6 @@ package com.zaneschepke.wireguardautotunnel.ui.screens.settings.proxy.compoents
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.stringResource
-import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.domain.enums.TunnelMode
 import com.zaneschepke.wireguardautotunnel.ui.common.sheet.CustomBottomSheet
 import com.zaneschepke.wireguardautotunnel.ui.common.sheet.SheetOption
@@ -29,12 +27,6 @@ fun AppModeBottomSheet(
                     onDismiss()
                     onAppModeChange(it)
                 },
-                description =
-                    when (it) {
-                        TunnelMode.VPN -> stringResource(R.string.vpn_desc)
-                        TunnelMode.PROXY -> stringResource(R.string.local_proxy_desc)
-                        TunnelMode.LOCK_DOWN -> stringResource(R.string.lockdown_desc)
-                    },
                 selected = tunnelMode == it,
             )
         }

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

@@ -19,7 +19,6 @@ import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.ui.LocalNavController
 import com.zaneschepke.wireguardautotunnel.ui.common.button.SurfaceRow
 import com.zaneschepke.wireguardautotunnel.ui.common.button.ThemedSwitch
-import com.zaneschepke.wireguardautotunnel.ui.common.text.DescriptionText
 import com.zaneschepke.wireguardautotunnel.ui.navigation.Route
 import com.zaneschepke.wireguardautotunnel.viewmodel.SharedAppViewModel
 import org.koin.compose.viewmodel.koinActivityViewModel
@@ -46,16 +45,13 @@ fun SecurityScreen(viewModel: SharedAppViewModel = koinActivityViewModel()) {
                     onClick = { viewModel.setScreenRecordingSecurity(it) },
                 )
             },
-            description = {
-                DescriptionText(stringResource(R.string.screen_recording_protection_desc))
-            },
             onClick = {
                 viewModel.setScreenRecordingSecurity(!uiState.isScreenRecordingProtectionEnabled)
             },
         )
         SurfaceRow(
             leading = { Icon(Icons.Outlined.Pin, contentDescription = null) },
-            title = stringResource(R.string.app_lock),
+            title = stringResource(R.string.enable_app_lock),
             trailing = {
                 ThemedSwitch(
                     checked = uiState.pinLockEnabled,
@@ -68,7 +64,6 @@ fun SecurityScreen(viewModel: SharedAppViewModel = koinActivityViewModel()) {
                     },
                 )
             },
-            description = { DescriptionText(stringResource(R.string.app_lock_desc)) },
             onClick = {
                 if (!uiState.pinLockEnabled) {
                     navController.push(Route.Lock)

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

@@ -26,7 +26,6 @@ import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
-import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
@@ -38,10 +37,8 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.res.vectorResource
 import androidx.compose.ui.unit.dp
-import com.dokar.sonner.ToastType
 import com.zaneschepke.wireguardautotunnel.BuildConfig
 import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.domain.sideeffect.GlobalSideEffect
 import com.zaneschepke.wireguardautotunnel.ui.LocalIsAndroidTV
 import com.zaneschepke.wireguardautotunnel.ui.LocalNavController
 import com.zaneschepke.wireguardautotunnel.ui.common.button.SurfaceRow
@@ -52,13 +49,12 @@ import com.zaneschepke.wireguardautotunnel.ui.navigation.Route
 import com.zaneschepke.wireguardautotunnel.ui.screens.support.components.PermissionDialog
 import com.zaneschepke.wireguardautotunnel.ui.screens.support.components.UpdateDialog
 import com.zaneschepke.wireguardautotunnel.util.Constants
-import com.zaneschepke.wireguardautotunnel.util.StringValue
 import com.zaneschepke.wireguardautotunnel.util.extensions.launchPlayStoreListing
 import com.zaneschepke.wireguardautotunnel.util.extensions.launchPlayStoreReview
 import com.zaneschepke.wireguardautotunnel.util.extensions.launchSupportEmail
 import com.zaneschepke.wireguardautotunnel.util.extensions.openWebUrl
+import com.zaneschepke.wireguardautotunnel.util.extensions.showToast
 import com.zaneschepke.wireguardautotunnel.viewmodel.SupportViewModel
-import kotlinx.coroutines.launch
 import org.koin.androidx.compose.koinViewModel
 import org.orbitmvi.orbit.compose.collectAsState
 
@@ -67,24 +63,11 @@ fun SupportScreen(viewModel: SupportViewModel = koinViewModel()) {
     val context = LocalContext.current
     val navController = LocalNavController.current
     val isTv = LocalIsAndroidTV.current
-    val scope = rememberCoroutineScope()
 
     val supportState by viewModel.collectAsState()
 
     val clipboardManager = rememberClipboardHelper()
 
-    val issuesUrl = stringResource(R.string.github_url)
-    val izzyUrl = stringResource(R.string.fdroid_url)
-    val telegramUrl = stringResource(R.string.telegram_url)
-    val matrixUrl = stringResource(R.string.matrix_url)
-    val docsUrl = stringResource(R.string.docs_url)
-    val websiteUrl = stringResource(R.string.website_url)
-    val translationUrl = stringResource(R.string.translation_url)
-    val privacyPolicyUrl = stringResource(R.string.privacy_policy_url)
-    val playStoreUrl = "https://play.google.com/store/apps/details?id=${context.packageName}"
-    val playReviewsUrl =
-        "https://play.google.com/store/apps/details?id=${context.packageName}&showAllReviews=true"
-
     val version = remember {
         "v${BuildConfig.VERSION_NAME +
                 if(BuildConfig.DEBUG) "-debug" else "" }"
@@ -112,19 +95,6 @@ fun SupportScreen(viewModel: SupportViewModel = koinViewModel()) {
         PermissionDialog(context = context, onDismiss = { showPermissionDialog = false })
     }
 
-    fun openWebUrl(url: String) {
-        context.openWebUrl(url).onFailure {
-            scope.launch {
-                viewModel.postSideEffect(
-                    GlobalSideEffect.Snackbar(
-                        StringValue.StringResource(R.string.no_browser_detected),
-                        ToastType.Error,
-                    )
-                )
-            }
-        }
-    }
-
     Column(
         modifier = Modifier.fillMaxSize().verticalScroll(rememberScrollState()),
         horizontalAlignment = Alignment.Start,
@@ -145,19 +115,19 @@ fun SupportScreen(viewModel: SupportViewModel = koinViewModel()) {
             )
             SurfaceRow(
                 stringResource(R.string.docs_description),
-                onClick = { openWebUrl(docsUrl) },
+                onClick = { context.openWebUrl(context.getString(R.string.docs_url)) },
                 leading = { Icon(Icons.Outlined.Book, contentDescription = null) },
                 trailing = { Icon(Icons.AutoMirrored.Outlined.Launch, null) },
             )
             SurfaceRow(
                 stringResource(R.string.website),
-                onClick = { openWebUrl(websiteUrl) },
+                onClick = { context.openWebUrl(context.getString(R.string.website_url)) },
                 leading = { Icon(Icons.Outlined.Web, contentDescription = null) },
                 trailing = { Icon(Icons.AutoMirrored.Outlined.Launch, null) },
             )
             SurfaceRow(
                 stringResource(R.string.translation),
-                onClick = { openWebUrl(translationUrl) },
+                onClick = { context.openWebUrl(context.getString(R.string.translation_url)) },
                 description = { DescriptionText(stringResource(R.string.help_translate)) },
                 leading = { Icon(Icons.Outlined.Translate, contentDescription = null) },
                 trailing = { Icon(Icons.AutoMirrored.Outlined.Launch, null) },
@@ -171,16 +141,14 @@ fun SupportScreen(viewModel: SupportViewModel = koinViewModel()) {
                 leading = { Icon(Icons.Outlined.Policy, contentDescription = null) },
                 title = stringResource(R.string.privacy_policy),
                 trailing = { Icon(Icons.AutoMirrored.Outlined.Launch, null) },
-                onClick = { openWebUrl(privacyPolicyUrl) },
+                onClick = { context.openWebUrl(context.getString(R.string.privacy_policy_url)) },
             )
             if (BuildConfig.FLAVOR == Constants.GOOGLE_PLAY_FLAVOR) {
                 SurfaceRow(
                     leading = { Icon(Icons.Outlined.Reviews, contentDescription = null) },
                     title = stringResource(R.string.review),
                     trailing = { Icon(Icons.AutoMirrored.Outlined.Launch, null) },
-                    onClick = {
-                        context.launchPlayStoreReview().onFailure { openWebUrl(playReviewsUrl) }
-                    },
+                    onClick = { context.launchPlayStoreReview() },
                 )
             }
         }
@@ -199,7 +167,7 @@ fun SupportScreen(viewModel: SupportViewModel = koinViewModel()) {
                 },
                 title = stringResource(R.string.join_matrix),
                 trailing = { Icon(Icons.AutoMirrored.Outlined.Launch, null) },
-                onClick = { openWebUrl(matrixUrl) },
+                onClick = { context.openWebUrl(context.getString(R.string.matrix_url)) },
             )
             SurfaceRow(
                 leading = {
@@ -211,7 +179,7 @@ fun SupportScreen(viewModel: SupportViewModel = koinViewModel()) {
                 },
                 title = stringResource(R.string.join_telegram),
                 trailing = { Icon(Icons.AutoMirrored.Outlined.Launch, null) },
-                onClick = { openWebUrl(telegramUrl) },
+                onClick = { context.openWebUrl(context.getString(R.string.telegram_url)) },
             )
             SurfaceRow(
                 leading = {
@@ -223,24 +191,13 @@ fun SupportScreen(viewModel: SupportViewModel = koinViewModel()) {
                 },
                 title = stringResource(R.string.open_issue),
                 trailing = { Icon(Icons.AutoMirrored.Outlined.Launch, null) },
-                onClick = { openWebUrl(issuesUrl) },
+                onClick = { context.openWebUrl(context.getString(R.string.github_url)) },
             )
             SurfaceRow(
                 leading = { Icon(Icons.Outlined.Mail, contentDescription = null) },
                 title = stringResource(R.string.email_description),
                 trailing = { Icon(Icons.AutoMirrored.Outlined.Launch, null) },
-                onClick = {
-                    context.launchSupportEmail().onFailure {
-                        scope.launch {
-                            viewModel.postSideEffect(
-                                GlobalSideEffect.Snackbar(
-                                    StringValue.StringResource(R.string.no_email_detected),
-                                    ToastType.Error,
-                                )
-                            )
-                        }
-                    }
-                },
+                onClick = { context.launchSupportEmail() },
             )
         }
         Column {
@@ -265,21 +222,12 @@ fun SupportScreen(viewModel: SupportViewModel = koinViewModel()) {
                 leading = { Icon(Icons.Outlined.InstallMobile, contentDescription = null) },
                 title = stringResource(R.string.check_for_update),
                 onClick = {
-                    if (BuildConfig.DEBUG) {
-                        scope.launch {
-                            viewModel.postSideEffect(
-                                GlobalSideEffect.Snackbar(
-                                    StringValue.StringResource(R.string.update_check_unsupported),
-                                    ToastType.Warning,
-                                )
-                            )
-                        }
-                        return@SurfaceRow
-                    }
+                    if (BuildConfig.DEBUG)
+                        return@SurfaceRow context.showToast(R.string.update_check_unsupported)
                     when (BuildConfig.FLAVOR) {
-                        Constants.GOOGLE_PLAY_FLAVOR ->
-                            context.launchPlayStoreListing().onFailure { openWebUrl(playStoreUrl) }
-                        Constants.FDROID_FLAVOR -> openWebUrl(izzyUrl)
+                        Constants.GOOGLE_PLAY_FLAVOR -> context.launchPlayStoreListing()
+                        Constants.FDROID_FLAVOR ->
+                            context.openWebUrl(context.getString(R.string.fdroid_url))
                         else -> viewModel.checkForStandaloneUpdate()
                     }
                 },

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/support/donate/crypto/AddressesScreen.kt

@@ -1,12 +1,10 @@
 package com.zaneschepke.wireguardautotunnel.ui.screens.support.donate.crypto
 
-import androidx.compose.foundation.gestures.Orientation
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
-import androidx.compose.material3.scrollbar
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -15,17 +13,10 @@ import com.zaneschepke.wireguardautotunnel.ui.screens.support.donate.crypto.comp
 
 @Composable
 fun AddressesScreen() {
-    val scrollState = rememberScrollState()
     Column(
         horizontalAlignment = Alignment.Start,
         verticalArrangement = Arrangement.Top,
-        modifier =
-            Modifier.fillMaxSize()
-                .verticalScroll(scrollState)
-                .scrollbar(
-                    state = scrollState.scrollIndicatorState,
-                    orientation = Orientation.Vertical,
-                ),
+        modifier = Modifier.fillMaxSize().verticalScroll(rememberScrollState()),
     ) {
         val clipboard = rememberClipboardHelper()
         Address.allAddresses.forEach { AddressItem(it) { address -> clipboard.copy(address) } }

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/support/license/components/LicenseList.kt

@@ -2,7 +2,6 @@ package com.zaneschepke.wireguardautotunnel.ui.screens.support.license.component
 
 import LicenseFileEntry
 import androidx.compose.foundation.clickable
-import androidx.compose.foundation.gestures.Orientation
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
@@ -10,13 +9,11 @@ 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.rememberLazyListState
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.outlined.Launch
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
-import androidx.compose.material3.scrollbar
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -27,17 +24,8 @@ import com.zaneschepke.wireguardautotunnel.util.extensions.openWebUrl
 @Composable
 fun LicenseList(licenses: List<LicenseFileEntry>) {
     val context = LocalContext.current
-    val lazyListState = rememberLazyListState()
 
-    LazyColumn(
-        modifier =
-            Modifier.fillMaxSize()
-                .scrollbar(
-                    state = lazyListState.scrollIndicatorState,
-                    orientation = Orientation.Vertical,
-                ),
-        state = lazyListState,
-    ) {
+    LazyColumn(modifier = Modifier.fillMaxSize()) {
         items(licenses) { entry ->
             Row(
                 verticalAlignment = Alignment.CenterVertically,

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

@@ -13,7 +13,6 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import com.dokar.sonner.ToastType
 import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.ui.LocalNavController
 import com.zaneschepke.wireguardautotunnel.ui.common.dialog.InfoDialog
@@ -51,15 +50,11 @@ fun TunnelsScreen(sharedViewModel: SharedAppViewModel = koinActivityViewModel())
         rememberFileExportLauncherForResult(
             onSuccess = { uri -> sharedViewModel.exportSelectedTunnels(uri) },
             onCanceled = {
-                sharedViewModel.showSnackMessage(
-                    StringValue.StringResource(R.string.export_canceled),
-                    ToastType.Warning,
-                )
+                sharedViewModel.showToast(StringValue.StringResource(R.string.export_canceled))
             },
             onUnsupported = {
                 sharedViewModel.showSnackMessage(
-                    StringValue.StringResource(R.string.export_unsupported),
-                    ToastType.Warning,
+                    StringValue.StringResource(R.string.export_unsupported)
                 )
             },
         )
@@ -78,8 +73,7 @@ fun TunnelsScreen(sharedViewModel: SharedAppViewModel = koinActivityViewModel())
                     selectedTunnelsExportLauncher.launch(fileName)
                 } else {
                     sharedViewModel.showSnackMessage(
-                        StringValue.StringResource(R.string.error_no_file_explorer),
-                        ToastType.Error,
+                        StringValue.StringResource(R.string.error_no_file_explorer)
                     )
                 }
             }
@@ -93,8 +87,7 @@ fun TunnelsScreen(sharedViewModel: SharedAppViewModel = koinActivityViewModel())
         rememberFileImportLauncherForResult(
             onNoFileExplorer = {
                 sharedViewModel.showSnackMessage(
-                    StringValue.StringResource(R.string.error_no_file_explorer),
-                    ToastType.Error,
+                    StringValue.StringResource(R.string.error_no_file_explorer)
                 )
             },
             onData = { data -> sharedViewModel.importFromUri(data) },
@@ -108,15 +101,13 @@ fun TunnelsScreen(sharedViewModel: SharedAppViewModel = koinActivityViewModel())
                 }
                 QRResult.QRMissingPermission -> {
                     sharedViewModel.showSnackMessage(
-                        StringValue.StringResource(R.string.camera_permission_required),
-                        ToastType.Warning,
+                        StringValue.StringResource(R.string.camera_permission_required)
                     )
                 }
                 is QRResult.QRSuccess -> {
                     result.content.rawValue?.let { sharedViewModel.importFromQr(it) }
                         ?: sharedViewModel.showSnackMessage(
-                            StringValue.StringResource(R.string.config_error),
-                            ToastType.Error,
+                            StringValue.StringResource(R.string.config_error)
                         )
                 }
                 QRResult.QRUserCanceled -> Unit
@@ -128,8 +119,7 @@ fun TunnelsScreen(sharedViewModel: SharedAppViewModel = koinActivityViewModel())
             ->
             if (!isGranted) {
                 sharedViewModel.showSnackMessage(
-                    StringValue.StringResource(R.string.camera_permission_required),
-                    ToastType.Warning,
+                    StringValue.StringResource(R.string.camera_permission_required)
                 )
                 return@rememberLauncherForActivityResult
             }

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/tunnels/components/PeerStatisticsSection.kt

@@ -42,8 +42,5 @@ fun PeerStatisticsSection(peer: ActivePeer) {
             style = style,
             color = color,
         )
-        peer.endpoint?.let {
-            StatText(stringResource(R.string.endpoint_template, it), style = style, color = color)
-        }
     }
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/tunnels/components/TransferStatsRow.kt

@@ -42,6 +42,6 @@ private fun TransferMetric(icon: ImageVector, text: String, style: TextStyle, co
             modifier = Modifier.size(12.dp),
         )
 
-        Text(text = text, style = style, color = color)
+        Text(text = text.lowercase(), style = style, color = color)
     }
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/tunnels/components/TunnelList.kt

@@ -1,7 +1,6 @@
 package com.zaneschepke.wireguardautotunnel.ui.screens.tunnels.components
 
 import androidx.compose.foundation.ExperimentalFoundationApi
-import androidx.compose.foundation.gestures.Orientation
 import androidx.compose.foundation.gestures.ScrollableDefaults
 import androidx.compose.foundation.gestures.detectTapGestures
 import androidx.compose.foundation.layout.size
@@ -13,10 +12,8 @@ import androidx.compose.foundation.rememberOverscrollEffect
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.rounded.Circle
 import androidx.compose.material3.Icon
-import androidx.compose.material3.scrollbar
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -69,11 +66,7 @@ fun TunnelList(
                         viewModel.clearSelectedTunnels()
                     }
                 }
-                .overscroll(rememberOverscrollEffect())
-                .scrollbar(
-                    state = lazyListState.scrollIndicatorState,
-                    orientation = Orientation.Vertical,
-                ),
+                .overscroll(rememberOverscrollEffect()),
         state = lazyListState,
         userScrollEnabled = true,
         reverseLayout = false,
@@ -94,7 +87,8 @@ fun TunnelList(
                     uiState.backendStatus.activeTunnels[tunnel.id] ?: ActiveTunnel()
                 }
 
-            val displayState = remember(activeTunnel) { DisplayTunnelState.from(activeTunnel) }
+            val displayState =
+                uiState.displayStates[tunnel.id] ?: DisplayTunnelState.from(activeTunnel)
 
             val isRunning = uiState.backendStatus.activeTunnels.containsKey(tunnel.id)
 
@@ -113,7 +107,7 @@ fun TunnelList(
                     Icon(
                         Icons.Rounded.Circle,
                         contentDescription = stringResource(R.string.tunnel_monitoring),
-                        tint = remember(displayState) { displayState.asColor() },
+                        tint = displayState.asColor(),
                         modifier = Modifier.size(14.dp),
                     )
                 },

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

@@ -141,10 +141,6 @@ fun TunnelSettingsScreen(
                 onClick = { navController.push(Route.IPv6(tunnel.id)) },
             )
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-                val meteredDisabled = sharedUiState.tunnelMode == TunnelMode.PROXY
-                val meteredTunnelDesc =
-                    if (meteredDisabled) stringResource(R.string.unavailable_in_mode)
-                    else stringResource(R.string.metered_tunnel_desc)
                 SurfaceRow(
                     leading = {
                         Icon(
@@ -157,9 +153,15 @@ fun TunnelSettingsScreen(
                     },
                     title = stringResource(R.string.metered_tunnel),
                     enabled = sharedUiState.tunnelMode != TunnelMode.PROXY,
-                    description = {
-                        DescriptionText(meteredTunnelDesc, disabled = meteredDisabled)
-                    },
+                    description =
+                        if (sharedUiState.tunnelMode == TunnelMode.PROXY) {
+                            {
+                                DescriptionText(
+                                    stringResource(R.string.unavailable_in_mode),
+                                    disabled = true,
+                                )
+                            }
+                        } else null,
                     trailing = {
                         ThemedSwitch(
                             checked = tunnel.isMetered,
@@ -170,26 +172,26 @@ fun TunnelSettingsScreen(
                     onClick = { viewModel.onMetered(!tunnel.isMetered) },
                 )
             }
-        }
-        Column {
-            GroupLabel(
-                stringResource(R.string.automation),
-                modifier = Modifier.padding(horizontal = 16.dp),
-            )
-            SurfaceRow(
-                leading = { Icon(Icons.Outlined.Dns, contentDescription = null) },
-                title = stringResource(R.string.ddns_auto_update),
-                description = {
-                    DescriptionText(stringResource(R.string.ddns_auto_update_description))
-                },
-                trailing = {
-                    ThemedSwitch(
-                        checked = tunnel.dynamicDnsEnabled,
-                        onClick = { viewModel.onDynamicDns(it) },
-                    )
-                },
-                onClick = { viewModel.onDynamicDns(!tunnel.dynamicDnsEnabled) },
-            )
+            Column {
+                GroupLabel(
+                    stringResource(R.string.automation),
+                    modifier = Modifier.padding(horizontal = 16.dp),
+                )
+                SurfaceRow(
+                    leading = { Icon(Icons.Outlined.Dns, contentDescription = null) },
+                    title = stringResource(R.string.ddns_auto_update),
+                    description = {
+                        DescriptionText(stringResource(R.string.ddns_auto_update_description))
+                    },
+                    trailing = {
+                        ThemedSwitch(
+                            checked = tunnel.dynamicDnsEnabled,
+                            onClick = { viewModel.onDynamicDns(it) },
+                        )
+                    },
+                    onClick = { viewModel.onDynamicDns(!tunnel.dynamicDnsEnabled) },
+                )
+            }
         }
     }
 }

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

@@ -1,6 +1,5 @@
 package com.zaneschepke.wireguardautotunnel.ui.screens.tunnels.settings.config
 
-import androidx.compose.foundation.gestures.Orientation
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxSize
@@ -10,7 +9,6 @@ import androidx.compose.foundation.text.selection.SelectionContainer
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
-import androidx.compose.material3.scrollbar
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
@@ -28,16 +26,14 @@ import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.font.FontStyle
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
-import com.dokar.sonner.ToastType
 import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.domain.sideeffect.GlobalSideEffect
 import com.zaneschepke.wireguardautotunnel.ui.common.functions.rememberClipboardHelper
 import com.zaneschepke.wireguardautotunnel.ui.screens.tunnels.settings.config.components.QrCodeDialog
 import com.zaneschepke.wireguardautotunnel.ui.sideeffect.LocalSideEffect
 import com.zaneschepke.wireguardautotunnel.ui.theme.ConfigHeaderColor
 import com.zaneschepke.wireguardautotunnel.ui.theme.ConfigKeyColor
-import com.zaneschepke.wireguardautotunnel.util.StringValue
 import com.zaneschepke.wireguardautotunnel.util.extensions.isTextTooLargeForQr
+import com.zaneschepke.wireguardautotunnel.util.extensions.showToast
 import com.zaneschepke.wireguardautotunnel.viewmodel.SharedAppViewModel
 import com.zaneschepke.wireguardautotunnel.viewmodel.TunnelViewModel
 import org.koin.compose.viewmodel.koinActivityViewModel
@@ -61,8 +57,6 @@ fun ConfigScreen(
 
     var showQrModal by rememberSaveable { mutableStateOf(false) }
 
-    val scrollState = rememberScrollState()
-
     val rawConfig by
         remember(liveConfig, uiState.activeConfig, uiState.tunnel?.quickConfig) {
             derivedStateOf {
@@ -78,12 +72,7 @@ fun ConfigScreen(
         when (sideEffect) {
             is LocalSideEffect.Modal.QR -> {
                 if (tunnel.quickConfig.isTextTooLargeForQr()) {
-                    sharedViewModel.postSideEffect(
-                        GlobalSideEffect.Snackbar(
-                            StringValue.StringResource(R.string.text_too_large_for_qr),
-                            ToastType.Error,
-                        )
-                    )
+                    context.showToast(R.string.text_too_large_for_qr)
                 } else {
                     showQrModal = true
                 }
@@ -101,13 +90,7 @@ fun ConfigScreen(
     Column(
         horizontalAlignment = Alignment.Start,
         verticalArrangement = Arrangement.spacedBy(12.dp, Alignment.Top),
-        modifier =
-            Modifier.fillMaxSize()
-                .verticalScroll(scrollState)
-                .scrollbar(
-                    state = scrollState.scrollIndicatorState,
-                    orientation = Orientation.Vertical,
-                ),
+        modifier = Modifier.fillMaxSize().verticalScroll(rememberScrollState()),
     ) {
         val displayText by
             remember(rawConfig, showKeys) { derivedStateOf { maskSensitive(rawConfig, showKeys) } }

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/tunnels/settings/config/edit/ConfigEditScreen.kt

@@ -1,6 +1,5 @@
 package com.zaneschepke.wireguardautotunnel.ui.screens.tunnels.settings.config.edit
 
-import androidx.compose.foundation.gestures.Orientation
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
@@ -13,7 +12,6 @@ import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.HdrAuto
 import androidx.compose.material3.Icon
 import androidx.compose.material3.Text
-import androidx.compose.material3.scrollbar
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
@@ -51,12 +49,11 @@ fun ConfigEditScreen(
     val uiState by viewModel.collectAsState()
 
     if (uiState.isLoading) return
+
     val locale = Locale.current.platformLocale
 
     var showSelectionDialog by rememberSaveable { mutableStateOf(false) }
 
-    val scrollState = rememberScrollState()
-
     sharedViewModel.collectSideEffect { sideEffect ->
         when (sideEffect) {
             is LocalSideEffect.SaveChanges -> {
@@ -107,14 +104,7 @@ fun ConfigEditScreen(
     Column(
         horizontalAlignment = Alignment.Start,
         verticalArrangement = Arrangement.spacedBy(16.dp, Alignment.Top),
-        modifier =
-            Modifier.fillMaxSize()
-                .imePadding()
-                .verticalScroll(scrollState)
-                .scrollbar(
-                    state = scrollState.scrollIndicatorState,
-                    orientation = Orientation.Vertical,
-                ),
+        modifier = Modifier.fillMaxSize().imePadding().verticalScroll(rememberScrollState()),
     ) {
         if (uiState.isGlobalConfig) {
             Column {
@@ -122,7 +112,7 @@ fun ConfigEditScreen(
                     leading = {
                         Icon(ImageVector.vectorResource(R.drawable.host), contentDescription = null)
                     },
-                    title = stringResource(R.string.dns_servers),
+                    title = stringResource(R.string.global_dns_servers),
                     trailing = { modifier ->
                         ThemedSwitch(
                             checked = uiState.globalSettings.dnsEnabled,
@@ -136,7 +126,7 @@ fun ConfigEditScreen(
                 )
                 SurfaceRow(
                     leading = { Icon(Icons.Outlined.HdrAuto, contentDescription = null) },
-                    title = stringResource(R.string.amnezia_configuration),
+                    title = stringResource(R.string.global_amnezia_configuration),
                     trailing = { modifier ->
                         ThemedSwitch(
                             checked = uiState.globalSettings.amneziaEnabled,

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/tunnels/sort/SortScreen.kt

@@ -1,6 +1,5 @@
 package com.zaneschepke.wireguardautotunnel.ui.screens.tunnels.sort
 
-import androidx.compose.foundation.gestures.Orientation
 import androidx.compose.foundation.gestures.ScrollableDefaults
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Row
@@ -18,7 +17,6 @@ import androidx.compose.material.icons.filled.ArrowUpward
 import androidx.compose.material.icons.filled.DragHandle
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
-import androidx.compose.material3.scrollbar
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
@@ -109,11 +107,7 @@ fun SortScreen(sharedViewModel: SharedAppViewModel = koinActivityViewModel()) {
             Modifier.pointerInput(Unit) {
                     if (tunnelsUiState.tunnels.isEmpty()) return@pointerInput
                 }
-                .overscroll(rememberOverscrollEffect())
-                .scrollbar(
-                    state = lazyListState.scrollIndicatorState,
-                    orientation = Orientation.Vertical,
-                ),
+                .overscroll(rememberOverscrollEffect()),
         state = lazyListState,
         userScrollEnabled = true,
         reverseLayout = false,

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/state/DisplayTunnelState.kt

@@ -26,33 +26,38 @@ sealed class DisplayTunnelState {
 
     data object Connected : DisplayTunnelState()
 
-    data object HandshakeFailure : DisplayTunnelState()
+    data object Degraded : DisplayTunnelState()
 
     @StringRes
-    fun labelRes(): Int =
-        when (this) {
+    fun labelRes(): Int {
+        return when (this) {
             Disconnected -> R.string.tunnel_state_disconnected
-            Connecting,
-            EstablishingConnection -> R.string.tunnel_state_establishing_connection
+            Connecting -> R.string.tunnel_state_starting
             ResolvingDns -> R.string.tunnel_state_resolving_dns
+            EstablishingConnection -> R.string.tunnel_state_establishing_connection
             Ready -> R.string.ready
             Connected -> R.string.tunnel_state_connected
-            HandshakeFailure -> R.string.tunnel_state_handshake_failure
+            Degraded -> R.string.tunnel_state_handshake_failure
         }
+    }
 
-    fun asColor(): Color =
-        when (this) {
+    fun asLocalizedString(context: Context): String {
+        return context.getString(labelRes())
+    }
+
+    fun asColor(): Color {
+        return when (this) {
             Disconnected -> CoolGray
+
             Connecting,
             ResolvingDns,
             EstablishingConnection,
             Ready -> Straw
-            Connected -> SilverTree
-            HandshakeFailure -> AlertRed
-        }
 
-    fun asLocalizedString(context: Context): String {
-        return context.getString(labelRes())
+            Connected -> SilverTree
+
+            Degraded -> AlertRed
+        }
     }
 
     companion object {
@@ -62,21 +67,49 @@ sealed class DisplayTunnelState {
             val mode = activeTunnel.mode
             val isVpnStyle = mode is BackendMode.Vpn || mode is BackendMode.Proxy.KillSwitchPrimary
 
+            // Static peers bootstrap never goes to complete, treat none the same
+            val bootstrapPhaseDone =
+                bootstrap is BootstrapState.Complete || bootstrap is BootstrapState.None
+
             return when {
                 transport is Tunnel.State.Down -> Disconnected
-                bootstrap is BootstrapState.Failed -> HandshakeFailure
 
+                bootstrap is BootstrapState.Failed -> Degraded
+
+                // DNS resolution still in progress
                 bootstrap is BootstrapState.ResolvingDns ||
                     bootstrap is BootstrapState.UpdatingPeers -> ResolvingDns
 
                 transport is Tunnel.State.Up.Healthy -> Connected
 
-                transport is Tunnel.State.Up.HandshakeFailure -> HandshakeFailure
+                transport is Tunnel.State.Up.HandshakeFailure -> {
+                    val age = System.currentTimeMillis() - activeTunnel.lastStateChangeMs
 
-                transport is Tunnel.State.Starting ->
-                    if (isVpnStyle) EstablishingConnection else Ready
+                    if (age > 15_000L && bootstrapPhaseDone) {
+                        Degraded
+                    } else if (isVpnStyle && bootstrapPhaseDone) {
+                        EstablishingConnection
+                    } else if (bootstrapPhaseDone) {
+                        // For regular proxy mode, we go to ready once past bootstrap phase
+                        Ready
+                    } else {
+                        Connecting
+                    }
+                }
 
-                else -> if (isVpnStyle) EstablishingConnection else Ready
+                transport is Tunnel.State.Starting -> {
+                    when {
+                        bootstrapPhaseDone -> {
+                            if (isVpnStyle) EstablishingConnection else Ready
+                        }
+                        else -> Connecting
+                    }
+                }
+
+                // Final fallback after bootstrap phase is done
+                bootstrapPhaseDone -> if (isVpnStyle) EstablishingConnection else Ready
+
+                else -> Connecting
             }
         }
     }

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/theme/Color.kt

@@ -16,14 +16,14 @@ val ElectricTeal = Color(0xFF4DD0E1)
 // Status colors
 val SilverTree = Color(0xFF6DB58B)
 val AlertRed = Color(0xFFCF6679)
+
 val Straw = Color(0xFFD4C483)
 
 val Disabled = CoolGray.copy(alpha = 0.4f)
 
-// Other colors
+// Config colors
 val ConfigHeaderColor = Color(0xFFBB86FC)
 val ConfigKeyColor = Color(0xFF03DAC5)
-val Heart = Color(0xFFDB61A2)
 
 sealed class ThemeColors(
     val background: Color,

app/src/main/java/com/zaneschepke/wireguardautotunnel/util/extensions/ContextExtensions.kt

@@ -14,12 +14,13 @@ import android.os.Build
 import android.os.PowerManager
 import android.provider.Settings
 import android.service.quicksettings.TileService
+import android.widget.Toast
 import androidx.core.content.FileProvider
 import androidx.core.net.toUri
 import com.zaneschepke.wireguardautotunnel.MainActivity
 import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.service.tile.AutoTunnelControlTile
-import com.zaneschepke.wireguardautotunnel.service.tile.TunnelControlTile
+import com.zaneschepke.wireguardautotunnel.core.service.tile.AutoTunnelControlTile
+import com.zaneschepke.wireguardautotunnel.core.service.tile.TunnelControlTile
 import com.zaneschepke.wireguardautotunnel.ui.screens.tunnels.splittunnel.state.TunnelApp
 import com.zaneschepke.wireguardautotunnel.util.Constants
 import com.zaneschepke.wireguardautotunnel.util.FileUtils
@@ -29,11 +30,17 @@ import java.util.Locale
 import kotlin.system.exitProcess
 import timber.log.Timber
 
-fun Context.openWebUrl(url: String): Result<Unit> = runCatching {
-    val webpage: Uri = url.toUri()
-    val intent =
-        Intent(Intent.ACTION_VIEW, webpage).apply { addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) }
-    startActivity(intent)
+fun Context.openWebUrl(url: String): Result<Unit> {
+    return kotlin
+        .runCatching {
+            val webpage: Uri = url.toUri()
+            val intent =
+                Intent(Intent.ACTION_VIEW, webpage).apply {
+                    addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                }
+            startActivity(intent)
+        }
+        .onFailure { showToast(R.string.no_browser_detected) }
 }
 
 fun Context.isBatteryOptimizationsDisabled(): Boolean {
@@ -102,7 +109,15 @@ fun Context.launchShareFile(file: File) {
     this.startActivity(chooserIntent)
 }
 
-fun Context.launchSupportEmail(): Result<Unit> = runCatching {
+fun Context.showToast(resId: Int) {
+    Toast.makeText(this, this.getString(resId), Toast.LENGTH_LONG).show()
+}
+
+fun Context.showToast(message: String) {
+    Toast.makeText(this, message, Toast.LENGTH_LONG).show()
+}
+
+fun Context.launchSupportEmail() {
     val intent =
         Intent(Intent.ACTION_SENDTO).apply {
             data = "mailto:".toUri()
@@ -117,7 +132,7 @@ fun Context.launchSupportEmail(): Result<Unit> = runCatching {
             }
         )
     } else {
-        throw IllegalStateException("No email client found")
+        showToast(R.string.no_email_detected)
     }
 }
 
@@ -237,9 +252,9 @@ fun Context.installApk(apkFile: File) {
     startActivity(intent)
 }
 
-fun Context.launchPlayStoreListing(): Result<Unit> = runCatching {
+fun Context.launchPlayStoreListing() {
     val intent =
-        Intent(Intent.ACTION_VIEW, "market://details?id=$packageName".toUri()).apply {
+        Intent(Intent.ACTION_VIEW, Uri.parse("market://details?id=$packageName")).apply {
             addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
             setPackage("com.android.vending")
         }
@@ -247,12 +262,12 @@ fun Context.launchPlayStoreListing(): Result<Unit> = runCatching {
     if (intent.resolveActivity(packageManager) != null) {
         startActivity(intent)
     } else {
-        throw IllegalStateException("Play Store not found")
+        openWebUrl("https://play.google.com/store/apps/details?id=$packageName")
     }
 }
 
-fun Context.launchPlayStoreReview(): Result<Unit> = runCatching {
-    val uri = "market://details?id=$packageName&showAllReviews=true".toUri()
+fun Context.launchPlayStoreReview() {
+    val uri = Uri.parse("market://details?id=$packageName&showAllReviews=true")
     val intent =
         Intent(Intent.ACTION_VIEW, uri).apply {
             addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
@@ -261,7 +276,7 @@ fun Context.launchPlayStoreReview(): Result<Unit> = runCatching {
     if (intent.resolveActivity(packageManager) != null) {
         startActivity(intent)
     } else {
-        throw IllegalStateException("Play Store not found")
+        openWebUrl("https://play.google.com/store/apps/details?id=$packageName&showAllReviews=true")
     }
 }
 

app/src/main/java/com/zaneschepke/wireguardautotunnel/util/extensions/UiExtensions.kt

@@ -61,7 +61,7 @@ fun TunnelMode.asTitleString(context: Context): String {
 fun TunnelMode.asString(context: Context): String {
     return when (this) {
         TunnelMode.VPN -> context.getString(R.string.vpn)
-        TunnelMode.PROXY -> context.getString(R.string.local_proxy)
+        TunnelMode.PROXY -> context.getString(R.string.proxy)
         TunnelMode.LOCK_DOWN -> context.getString(R.string.lockdown)
     }
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/viewmodel/AutoTunnelViewModel.kt

@@ -2,12 +2,13 @@ package com.zaneschepke.wireguardautotunnel.viewmodel
 
 import androidx.core.content.PermissionChecker.PERMISSION_GRANTED
 import androidx.lifecycle.ViewModel
-import com.dokar.sonner.ToastType
 import com.zaneschepke.networkmonitor.NetworkMonitor
 import com.zaneschepke.networkmonitor.StableNetworkEngine
-import com.zaneschepke.tunnel.util.RootShell
+import com.zaneschepke.tunnel.backend.RootShell
 import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.core.orchestration.AutoTunnelCoordinator
+import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
+import com.zaneschepke.wireguardautotunnel.core.service.autotunnel.AutoTunnelStateHolder
 import com.zaneschepke.wireguardautotunnel.domain.enums.TunnelMode
 import com.zaneschepke.wireguardautotunnel.domain.enums.WifiDetectionMethod
 import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConfig
@@ -15,8 +16,6 @@ import com.zaneschepke.wireguardautotunnel.domain.repository.AutoTunnelSettingsR
 import com.zaneschepke.wireguardautotunnel.domain.repository.GlobalEffectRepository
 import com.zaneschepke.wireguardautotunnel.domain.repository.TunnelRepository
 import com.zaneschepke.wireguardautotunnel.domain.sideeffect.GlobalSideEffect
-import com.zaneschepke.wireguardautotunnel.service.ServiceManager
-import com.zaneschepke.wireguardautotunnel.service.autotunnel.AutoTunnelStateHolder
 import com.zaneschepke.wireguardautotunnel.ui.state.AutoTunnelUiState
 import com.zaneschepke.wireguardautotunnel.util.StringValue
 import kotlinx.coroutines.flow.combine
@@ -100,10 +99,7 @@ class AutoTunnelViewModel(
         val trimmed = name.trim()
         if (state.autoTunnelSettings.trustedNetworkSSIDs.contains(name)) {
             return@intent postSideEffect(
-                GlobalSideEffect.Snackbar(
-                    StringValue.StringResource(R.string.error_ssid_exists),
-                    ToastType.Error,
-                )
+                GlobalSideEffect.Snackbar(StringValue.StringResource(R.string.error_ssid_exists))
             )
         }
         setTrustedNetworkNames(
@@ -157,19 +153,11 @@ class AutoTunnelViewModel(
         when (method) {
             WifiDetectionMethod.ROOT -> {
                 val accepted = RootShell.requestRootPermission()
-                if (!accepted)
-                    return@intent postSideEffect(
-                        GlobalSideEffect.Snackbar(
-                            StringValue.StringResource(R.string.error_root_denied),
-                            ToastType.Error,
-                        )
-                    )
-                postSideEffect(
-                    GlobalSideEffect.Snackbar(
-                        StringValue.StringResource(R.string.root_accepted),
-                        ToastType.Success,
-                    )
-                )
+                val message =
+                    if (!accepted) StringValue.StringResource(R.string.error_root_denied)
+                    else StringValue.StringResource(R.string.root_accepted)
+                postSideEffect(GlobalSideEffect.Snackbar(message))
+                if (!accepted) return@intent
             }
             WifiDetectionMethod.SHIZUKU -> {
                 requestShizuku()
@@ -200,10 +188,7 @@ class AutoTunnelViewModel(
             )
         } catch (_: Exception) {
             postSideEffect(
-                GlobalSideEffect.Snackbar(
-                    StringValue.StringResource(R.string.shizuku_not_detected),
-                    ToastType.Error,
-                )
+                GlobalSideEffect.Snackbar(StringValue.StringResource(R.string.shizuku_not_detected))
             )
         }
     }

app/src/main/java/com/zaneschepke/wireguardautotunnel/viewmodel/ConfigEditViewModel.kt

@@ -1,7 +1,6 @@
 package com.zaneschepke.wireguardautotunnel.viewmodel
 
 import androidx.lifecycle.ViewModel
-import com.dokar.sonner.ToastType
 import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.core.orchestration.TunnelCoordinator
 import com.zaneschepke.wireguardautotunnel.domain.enums.MimicMode
@@ -94,6 +93,7 @@ class ConfigEditViewModel(
                                 tunnel = tunnel,
                                 tunnels = tunnels,
                                 isRunning = isRunning,
+                                globalSettings = globalSettings,
                             )
                         }
                     }
@@ -106,10 +106,7 @@ class ConfigEditViewModel(
         if (state.isTunnelNameTaken) {
 
             postSideEffect(
-                GlobalSideEffect.Snackbar(
-                    StringValue.StringResource(R.string.tunnel_name_taken),
-                    ToastType.Error,
-                )
+                GlobalSideEffect.Snackbar(StringValue.StringResource(R.string.tunnel_name_taken))
             )
 
             return@intent
@@ -117,10 +114,7 @@ class ConfigEditViewModel(
 
         if (state.draft.tunnelName.isBlank()) {
             postSideEffect(
-                GlobalSideEffect.Snackbar(
-                    StringValue.StringResource(R.string.name_error_empty),
-                    ToastType.Error,
-                )
+                GlobalSideEffect.Snackbar(StringValue.StringResource(R.string.name_error_empty))
             )
             return@intent
         }
@@ -154,9 +148,8 @@ class ConfigEditViewModel(
                     }
 
                     postSideEffect(
-                        GlobalSideEffect.Snackbar(
-                            StringValue.StringResource(R.string.config_changes_saved),
-                            ToastType.Success,
+                        GlobalSideEffect.Toast(
+                            StringValue.StringResource(R.string.config_changes_saved)
                         )
                     )
 
@@ -172,7 +165,7 @@ class ConfigEditViewModel(
                         else -> StringValue.StringResource(R.string.unknown_error)
                     }
 
-                postSideEffect(GlobalSideEffect.Snackbar(message, ToastType.Error))
+                postSideEffect(GlobalSideEffect.Snackbar(message))
             }
     }
 

app/src/main/java/com/zaneschepke/wireguardautotunnel/viewmodel/DnsViewModel.kt

@@ -1,7 +1,6 @@
 package com.zaneschepke.wireguardautotunnel.viewmodel
 
 import androidx.lifecycle.ViewModel
-import com.dokar.sonner.ToastType
 import com.zaneschepke.networkmonitor.NetworkMonitor
 import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.core.orchestration.DnsSettingsCoordinator
@@ -10,6 +9,7 @@ import com.zaneschepke.wireguardautotunnel.domain.repository.DnsSettingsReposito
 import com.zaneschepke.wireguardautotunnel.domain.repository.GlobalEffectRepository
 import com.zaneschepke.wireguardautotunnel.domain.repository.TunnelRepository
 import com.zaneschepke.wireguardautotunnel.domain.sideeffect.GlobalSideEffect
+import com.zaneschepke.wireguardautotunnel.ui.common.snackbar.SnackbarType
 import com.zaneschepke.wireguardautotunnel.ui.state.DnsUiState
 import com.zaneschepke.wireguardautotunnel.util.DnsValidator
 import com.zaneschepke.wireguardautotunnel.util.StringValue
@@ -70,7 +70,7 @@ class DnsViewModel(
                 postSideEffect(
                     GlobalSideEffect.Snackbar(
                         StringValue.StringResource(result.error.labelRes()),
-                        type = ToastType.Error,
+                        type = SnackbarType.WARNING,
                     )
                 )
                 return@intent
@@ -87,10 +87,7 @@ class DnsViewModel(
 
         postSideEffect(GlobalSideEffect.PopBackStack)
         postSideEffect(
-            GlobalSideEffect.Snackbar(
-                StringValue.StringResource(R.string.config_changes_saved),
-                ToastType.Success,
-            )
+            GlobalSideEffect.Toast(StringValue.StringResource(R.string.config_changes_saved))
         )
     }
 

app/src/main/java/com/zaneschepke/wireguardautotunnel/viewmodel/LockdownViewModel.kt

@@ -1,7 +1,6 @@
 package com.zaneschepke.wireguardautotunnel.viewmodel
 
 import androidx.lifecycle.ViewModel
-import com.dokar.sonner.ToastType
 import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelProvider
 import com.zaneschepke.wireguardautotunnel.domain.repository.GlobalEffectRepository
@@ -53,10 +52,7 @@ class LockdownViewModel(
 
         postSideEffect(GlobalSideEffect.PopBackStack)
         postSideEffect(
-            GlobalSideEffect.Snackbar(
-                StringValue.StringResource(R.string.config_changes_saved),
-                ToastType.Success,
-            )
+            GlobalSideEffect.Toast(StringValue.StringResource(R.string.config_changes_saved))
         )
     }
 

app/src/main/java/com/zaneschepke/wireguardautotunnel/viewmodel/LoggerViewModel.kt

@@ -2,7 +2,6 @@ package com.zaneschepke.wireguardautotunnel.viewmodel
 
 import android.net.Uri
 import androidx.lifecycle.ViewModel
-import com.dokar.sonner.ToastType
 import com.zaneschepke.logcatter.LogReader
 import com.zaneschepke.wireguardautotunnel.BuildConfig
 import com.zaneschepke.wireguardautotunnel.R
@@ -62,10 +61,7 @@ class LoggerViewModel(
     fun exportLogs(uri: Uri?) = intent {
         if (uri == null) {
             postSideEffect(
-                GlobalSideEffect.Snackbar(
-                    StringValue.StringResource(R.string.export_unsupported),
-                    ToastType.Warning,
-                )
+                GlobalSideEffect.Toast(StringValue.StringResource(R.string.export_unsupported))
             )
             return@intent
         }
@@ -80,12 +76,11 @@ class LoggerViewModel(
             Timber.e(action)
             intent {
                 postSideEffect(
-                    GlobalSideEffect.Snackbar(
+                    GlobalSideEffect.Toast(
                         StringValue.StringResource(
                             R.string.export_failed,
                             ": ${action.localizedMessage}",
-                        ),
-                        ToastType.Error,
+                        )
                     )
                 )
             }

app/src/main/java/com/zaneschepke/wireguardautotunnel/viewmodel/ProxySettingsViewModel.kt

@@ -1,7 +1,6 @@
 package com.zaneschepke.wireguardautotunnel.viewmodel
 
 import androidx.lifecycle.ViewModel
-import com.dokar.sonner.ToastType
 import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.core.orchestration.TunnelCoordinator
 import com.zaneschepke.wireguardautotunnel.domain.repository.GlobalEffectRepository
@@ -28,26 +27,21 @@ class ProxySettingsViewModel(
             combine(tunnelCoordinator.backendStatus, proxySettingsRepository.flow) {
                     backendStatus,
                     settings ->
-                    if (state.isLoading) {
-                        ProxySettingsUiState(
-                            proxySettings = settings,
-                            backendStatus = backendStatus,
-                            isLoading = false,
-                            socks5Enabled = settings.socks5ProxyEnabled,
-                            httpEnabled = settings.httpProxyEnabled,
-                            socksBindAddress = settings.socks5ProxyBindAddress ?: "",
-                            httpBindAddress = settings.httpProxyBindAddress ?: "",
-                            proxyUsername = settings.proxyUsername ?: "",
-                            proxyPassword = settings.proxyPassword ?: "",
-                        )
-                    } else {
-                        state.copy(backendStatus = backendStatus)
-                    }
+                    ProxySettingsUiState(
+                        proxySettings = settings,
+                        backendStatus = backendStatus,
+                        isLoading = false,
+                        socks5Enabled = settings.socks5ProxyEnabled,
+                        httpEnabled = settings.httpProxyEnabled,
+                        socksBindAddress = settings.socks5ProxyBindAddress ?: "",
+                        httpBindAddress = settings.httpProxyBindAddress ?: "",
+                        proxyUsername = settings.proxyUsername ?: "",
+                        proxyPassword = settings.proxyPassword ?: "",
+                    )
                 }
                 .collect { reduce { it } }
         }
 
-    // TODO add a dialog requesting restart if any tunnels active
     fun save() = intent {
         reduce { state.copy(showSaveModal = false) }
 
@@ -80,8 +74,7 @@ class ProxySettingsViewModel(
             if (socksPort == null || httpPort == null || socksPort == httpPort) {
                 return@intent postSideEffect(
                     GlobalSideEffect.Snackbar(
-                        StringValue.StringResource(R.string.ports_must_differ),
-                        ToastType.Error,
+                        StringValue.StringResource(R.string.ports_must_differ)
                     )
                 )
             }
@@ -98,21 +91,18 @@ class ProxySettingsViewModel(
 
         if (updated.proxyPassword?.any { it.isWhitespace() } == true) {
             postSideEffect(
-                GlobalSideEffect.Snackbar(
-                    StringValue.StringResource(R.string.password_no_spaces),
-                    ToastType.Error,
-                )
+                GlobalSideEffect.Snackbar(StringValue.StringResource(R.string.password_no_spaces))
             )
             return@intent reduce { state.copy(isPasswordError = true) }
         }
 
         proxySettingsRepository.upsert(updated)
 
+        tunnelCoordinator.toggleTunnels()
+        tunnelCoordinator.toggleTunnels()
+
         postSideEffect(
-            GlobalSideEffect.Snackbar(
-                StringValue.StringResource(R.string.config_changes_saved),
-                ToastType.Success,
-            )
+            GlobalSideEffect.Snackbar(StringValue.StringResource(R.string.config_changes_saved))
         )
         postSideEffect(GlobalSideEffect.PopBackStack)
     }

app/src/main/java/com/zaneschepke/wireguardautotunnel/viewmodel/SettingsViewModel.kt

@@ -1,8 +1,7 @@
 package com.zaneschepke.wireguardautotunnel.viewmodel
 
 import androidx.lifecycle.ViewModel
-import com.dokar.sonner.ToastType
-import com.zaneschepke.tunnel.util.RootShell
+import com.zaneschepke.tunnel.backend.RootShell
 import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.core.orchestration.TunnelCoordinator
 import com.zaneschepke.wireguardautotunnel.core.shortcut.ShortcutManager
@@ -97,19 +96,11 @@ class SettingsViewModel(
     fun setTunnelScriptedEnabled(to: Boolean) = intent {
         if (to) {
             val accepted = RootShell.requestRootPermission()
-            if (!accepted)
-                return@intent postSideEffect(
-                    GlobalSideEffect.Snackbar(
-                        StringValue.StringResource(R.string.error_root_denied),
-                        ToastType.Error,
-                    )
-                )
-            postSideEffect(
-                GlobalSideEffect.Snackbar(
-                    StringValue.StringResource(R.string.root_accepted),
-                    ToastType.Success,
-                )
-            )
+            val message =
+                if (!accepted) StringValue.StringResource(R.string.error_root_denied)
+                else StringValue.StringResource(R.string.root_accepted)
+            postSideEffect(GlobalSideEffect.Snackbar(message))
+            if (!accepted) return@intent
         }
         settingsRepository.upsert(state.settings.copy(tunnelScriptingEnabled = to))
     }

app/src/main/java/com/zaneschepke/wireguardautotunnel/viewmodel/SharedAppViewModel.kt

@@ -3,10 +3,11 @@ package com.zaneschepke.wireguardautotunnel.viewmodel
 import android.net.Uri
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.dokar.sonner.ToastType
 import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.core.orchestration.TunnelCoordinator
 import com.zaneschepke.wireguardautotunnel.core.orchestration.TunnelModeCoordinator
+import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
+import com.zaneschepke.wireguardautotunnel.core.service.autotunnel.AutoTunnelStateHolder
 import com.zaneschepke.wireguardautotunnel.domain.enums.TunnelMode
 import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConfig
 import com.zaneschepke.wireguardautotunnel.domain.repository.AppStateRepository
@@ -16,10 +17,7 @@ import com.zaneschepke.wireguardautotunnel.domain.repository.SelectedTunnelsRepo
 import com.zaneschepke.wireguardautotunnel.domain.repository.TunnelRepository
 import com.zaneschepke.wireguardautotunnel.domain.sideeffect.GlobalSideEffect
 import com.zaneschepke.wireguardautotunnel.parser.ConfigParseException
-import com.zaneschepke.wireguardautotunnel.service.ServiceManager
-import com.zaneschepke.wireguardautotunnel.service.autotunnel.AutoTunnelStateHolder
 import com.zaneschepke.wireguardautotunnel.ui.sideeffect.LocalSideEffect
-import com.zaneschepke.wireguardautotunnel.ui.state.DisplayTunnelState
 import com.zaneschepke.wireguardautotunnel.ui.state.GlobalAppUiState
 import com.zaneschepke.wireguardautotunnel.ui.state.TunnelsUiState
 import com.zaneschepke.wireguardautotunnel.ui.theme.Theme
@@ -73,16 +71,10 @@ class SharedAppViewModel(
                 tunnelRepository.userTunnelsFlow,
                 tunnelCoordinator.backendStatus,
                 selectedTunnelsRepository.flow,
-            ) { tunnels, backendStatus, selectedTuns ->
-                val sortedTunnels = tunnels.sortedBy { it.position }
-
-                val displayStates =
-                    backendStatus.activeTunnels.mapValues { (_, activeTunnel) ->
-                        DisplayTunnelState.from(activeTunnel)
-                    }
-
+                tunnelCoordinator.tunnelDisplayStates,
+            ) { tunnels, backendStatus, selectedTuns, displayStates ->
                 TunnelsUiState(
-                    tunnels = sortedTunnels,
+                    tunnels = tunnels,
                     backendStatus = backendStatus,
                     displayStates = displayStates,
                     selectedTunnels = selectedTuns,
@@ -178,10 +170,6 @@ class SharedAppViewModel(
         appStateRepository.setShouldShowDonationSnackbar(to)
     }
 
-    fun showSnackMessage(message: StringValue, type: ToastType) = intent {
-        postGlobalSideEffect(GlobalSideEffect.Snackbar(message, type))
-    }
-
     suspend fun postSideEffect(globalSideEffect: GlobalSideEffect) {
         globalEffectRepository.post(globalSideEffect)
     }
@@ -192,6 +180,12 @@ class SharedAppViewModel(
         globalEffectRepository.post(sideEffect)
     }
 
+    fun showSnackMessage(message: StringValue) = intent {
+        postGlobalSideEffect(GlobalSideEffect.Snackbar(message))
+    }
+
+    fun showToast(message: StringValue) = intent { postSideEffect(GlobalSideEffect.Toast(message)) }
+
     fun disableBatteryOptimizationsShown() = intent {
         appStateRepository.setBatteryOptimizationDisableShown(true)
     }
@@ -199,20 +193,14 @@ class SharedAppViewModel(
     fun saveSortChanges(tunnels: List<TunnelConfig>) = intent {
         tunnelRepository.saveAll(tunnels.mapIndexed { index, conf -> conf.copy(position = index) })
         postSideEffect(
-            GlobalSideEffect.Snackbar(
-                StringValue.StringResource(R.string.config_changes_saved),
-                ToastType.Success,
-            )
+            GlobalSideEffect.Snackbar(StringValue.StringResource(R.string.config_changes_saved))
         )
         postSideEffect(GlobalSideEffect.PopBackStack)
     }
 
     fun sortByLatency(tunnels: List<TunnelConfig>) = intent {
         postSideEffect(
-            GlobalSideEffect.Snackbar(
-                StringValue.StringResource(R.string.pinging_servers),
-                ToastType.Info,
-            )
+            GlobalSideEffect.Snackbar(StringValue.StringResource(R.string.pinging_servers))
         )
         val sortedResult =
             withContext(Dispatchers.IO) {
@@ -254,17 +242,12 @@ class SharedAppViewModel(
                 TunnelConfig.tunnelConfFromQuick(config, name)
             }
             tunnelRepository.saveTunnelsUniquely(tunnelConfigs, state.tunnelNames.map { it.value })
-        } catch (e: Exception) {
-            if (e is ConfigParseException) {
-                postSideEffect(GlobalSideEffect.Snackbar(e.asStringValue(), ToastType.Error))
-            } else {
-                postSideEffect(
-                    GlobalSideEffect.Snackbar(
-                        StringValue.StringResource(R.string.config_error),
-                        ToastType.Error,
-                    )
-                )
-            }
+        } catch (_: IOException) {
+            postSideEffect(
+                GlobalSideEffect.Snackbar(StringValue.StringResource(R.string.read_failed))
+            )
+        } catch (e: ConfigParseException) {
+            postSideEffect(GlobalSideEffect.Snackbar(e.asStringValue()))
         }
     }
 
@@ -289,10 +272,7 @@ class SharedAppViewModel(
         } catch (e: Exception) {
             Timber.e(e)
             postSideEffect(
-                GlobalSideEffect.Snackbar(
-                    StringValue.StringResource(R.string.error_download_failed),
-                    ToastType.Error,
-                )
+                GlobalSideEffect.Toast(StringValue.StringResource(R.string.error_download_failed))
             )
         }
     }
@@ -307,7 +287,7 @@ class SharedAppViewModel(
                         is IOException -> StringValue.StringResource(R.string.error_download_failed)
                         else -> StringValue.StringResource(R.string.error_file_extension)
                     }
-                postSideEffect(GlobalSideEffect.Snackbar(message, ToastType.Error))
+                postSideEffect(GlobalSideEffect.Toast(message))
             }
     }
 
@@ -339,8 +319,7 @@ class SharedAppViewModel(
         if (selectedTuns.any { activeTunIds?.contains(it.id) == true })
             return@intent postSideEffect(
                 GlobalSideEffect.Snackbar(
-                    StringValue.StringResource(R.string.delete_active_message),
-                    ToastType.Error,
+                    StringValue.StringResource(R.string.delete_active_message)
                 )
             )
         tunnelRepository.delete(selectedTuns)
@@ -363,12 +342,11 @@ class SharedAppViewModel(
         val onFailure = { action: Throwable ->
             intent {
                 postSideEffect(
-                    GlobalSideEffect.Snackbar(
+                    GlobalSideEffect.Toast(
                         StringValue.StringResource(
                             R.string.export_failed,
                             ": ${action.localizedMessage}",
-                        ),
-                        ToastType.Error,
+                        )
                     )
                 )
             }
@@ -385,10 +363,7 @@ class SharedAppViewModel(
                     if (it.exists()) it.delete()
                 }
                 postSideEffect(
-                    GlobalSideEffect.Snackbar(
-                        StringValue.StringResource(R.string.export_success),
-                        ToastType.Success,
-                    )
+                    GlobalSideEffect.Snackbar(StringValue.StringResource(R.string.export_success))
                 )
                 clearSelectedTunnels()
             }

app/src/main/java/com/zaneschepke/wireguardautotunnel/viewmodel/SplitTunnelViewModel.kt

@@ -1,7 +1,6 @@
 package com.zaneschepke.wireguardautotunnel.viewmodel
 
 import androidx.lifecycle.ViewModel
-import com.dokar.sonner.ToastType
 import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.domain.repository.GlobalEffectRepository
 import com.zaneschepke.wireguardautotunnel.domain.repository.InstalledPackageRepository
@@ -89,14 +88,9 @@ class SplitTunnelViewModel(
             editableInterface.copy(includedApplications = included, excludedApplications = excluded)
         val updatedProxyConfig = editableConfig.copy(`interface` = updatedInterface)
         val updatedConfig = updatedProxyConfig.buildConfig()
-        tunnelRepository.save(
-            tunnel.copy(quickConfig = updatedConfig.withName(tunnel.name).asQuickString())
-        )
+        tunnelRepository.save(tunnel.copy(quickConfig = updatedConfig.asQuickString()))
         postSideEffect(
-            GlobalSideEffect.Snackbar(
-                StringValue.StringResource(R.string.config_changes_saved),
-                ToastType.Success,
-            )
+            GlobalSideEffect.Snackbar(StringValue.StringResource(R.string.config_changes_saved))
         )
         postSideEffect(GlobalSideEffect.PopBackStack)
     }

app/src/main/java/com/zaneschepke/wireguardautotunnel/viewmodel/SupportViewModel.kt

@@ -1,7 +1,6 @@
 package com.zaneschepke.wireguardautotunnel.viewmodel
 
 import androidx.lifecycle.ViewModel
-import com.dokar.sonner.ToastType
 import com.zaneschepke.wireguardautotunnel.BuildConfig
 import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.domain.model.AppUpdate
@@ -26,10 +25,7 @@ class SupportViewModel(
 
     fun checkForStandaloneUpdate() = intent {
         postSideEffect(
-            GlobalSideEffect.Snackbar(
-                StringValue.StringResource(R.string.checking_for_update),
-                ToastType.Info,
-            )
+            GlobalSideEffect.Toast(StringValue.StringResource(R.string.checking_for_update))
         )
         reduce { state.copy(isLoading = true) }
         updateRepository
@@ -37,19 +33,15 @@ class SupportViewModel(
             .onSuccess { update ->
                 if (update == null) {
                     postSideEffect(
-                        GlobalSideEffect.Snackbar(
-                            StringValue.StringResource(R.string.latest_installed),
-                            ToastType.Info,
+                        GlobalSideEffect.Toast(
+                            StringValue.StringResource(R.string.latest_installed)
                         )
                     )
                 } else reduce { state.copy(appUpdate = update.sanitized()) }
             }
             .onFailure {
                 postSideEffect(
-                    GlobalSideEffect.Snackbar(
-                        StringValue.StringResource(R.string.update_check_failed),
-                        ToastType.Error,
-                    )
+                    GlobalSideEffect.Toast(StringValue.StringResource(R.string.update_check_failed))
                 )
             }
         reduce { state.copy(isLoading = false) }
@@ -91,9 +83,8 @@ class SupportViewModel(
             .onSuccess { postSideEffect(GlobalSideEffect.InstallApk(it)) }
             .onFailure {
                 postSideEffect(
-                    GlobalSideEffect.Snackbar(
-                        StringValue.StringResource(R.string.update_download_failed),
-                        ToastType.Error,
+                    GlobalSideEffect.Toast(
+                        StringValue.StringResource(R.string.update_download_failed)
                     )
                 )
             }

app/src/main/res/values-ar/strings.xml

@@ -15,6 +15,7 @@
     <string name="delete_tunnel">Delete tunnel</string>
     <string name="tunnel_mobile_data">Tunnel on mobile data</string>
     <string name="logs">Logs</string>
+    <string name="enable_app_lock">Enable app lock</string>
     <string name="config_changes_saved">Configuration changes saved.</string>
     <string name="join_telegram">Join Telegram community</string>
     <string name="pin_created">Pin successfully created</string>
@@ -26,6 +27,7 @@
     <string name="remote_key">Remote key</string>
     <string name="mobile_data">Mobile data</string>
     <string name="use_shell_via_shizuku">Use shell via Shizuku to get Wi-Fi information, preventing the need for location permission on non-rooted devices</string>
+    <string name="stop_on_internet_loss">Stop tunnel on internet loss</string>
     <string name="vpn">VPN</string>
     <string name="tunnel_boot_description">Start the default tunnel on boot</string>
     <string name="allow_lan_traffic">Allow LAN traffic</string>
@@ -58,7 +60,7 @@
     <string name="wifi_settings">Wi-Fi settings</string>
     <string name="tunnel_on_wifi">Tunnel on Wi-Fi</string>
     <string name="add_peer">Add peer</string>
-    <string name="backup_success">Backup success</string>
+    <string name="backup_success">Backup success. %1$s</string>
     <string name="persistent_keepalive">Persistent keepalive</string>
     <string name="info">Info</string>
     <string name="exclude">Exclude</string>
@@ -131,6 +133,7 @@
     <string name="kofi">Ko-fi</string>
     <string name="donation_signoff">Gratefully,</string>
     <string name="selected">Selected</string>
+    <string name="global_split_tunneling">Global split tunneling</string>
     <string name="active_network">Active Network:</string>
     <string name="range_hint">(%1$d–%2$d)</string>
     <string name="delete_active_message">Cannot delete active tunnel.</string>
@@ -153,6 +156,7 @@
     <string name="mtu">MTU</string>
     <string name="configuration">Configuration</string>
     <string name="drag_handle">Drag Handle</string>
+    <string name="global_dns_servers">Global DNS servers</string>
     <string name="display_theme">Display theme</string>
     <string name="contact">Contact</string>
     <string name="ports_must_differ">Failed. Proxies must have different ports.</string>
@@ -253,6 +257,7 @@
     <string name="unavailable_in_mode">Unavailable in current mode</string>
     <string name="server_port">Server:Port</string>
     <string name="camera_permission_required">Camera permission required</string>
+    <string name="enabled_app_shortcuts">Enable app shortcuts</string>
     <string name="preferred_tunnel">Preferred tunnel</string>
     <string name="allow">Allow</string>
     <string name="underload_packet_magic_header">Underload packet magic header</string>
@@ -267,6 +272,7 @@
     <string name="settings">Settings</string>
     <string name="incorrect_pin">Pin is incorrect</string>
     <string name="export_failed">Export failed</string>
+    <string name="enable_remote_app_control">Enable remote app control</string>
     <string name="donation_closing">It\'s my dream to work for you on this project full-time.</string>
     <string name="update_download_failed">Update download failed.</string>
     <string name="network_name">Network:</string>
@@ -385,6 +391,7 @@
     <string name="dns_error_empty">Endpoint cannot be empty</string>
     <string name="tunnel_state_connected">Connected</string>
     <string name="dns_error_invalid_scheme">DoH must use HTTPS</string>
+    <string name="configuration_globals">Configuration globals</string>
     <string name="private_dns_hostname">Private DNS: hostname (%1$s)</string>
     <string name="app">App</string>
     <string name="refresh_rate">Statistics refresh rate</string>
@@ -426,6 +433,7 @@
     <string name="included_apps">%1$s apps included</string>
     <string name="error_http_port_unavailable">HTTP listener port %1$d is already in use.\nPlease choose a different port.</string>
     <string name="current_system_dns">Current system DNS</string>
+    <string name="global_amnezia_configuration">Global Amnezia configuration</string>
     <string name="security">Security</string>
     <string name="more_options">More options</string>
     <string name="status_template">status: %1$s</string>
@@ -459,4 +467,7 @@
     <string name="i4" translatable="false">I4</string>
     <string name="s1" translatable="false">S1</string>
     <string name="h4" translatable="false">H4</string>
+    <string name="getting_started_guidance">Use the + button to import a tunnel, or view the getting started guide.</string>
+    <string name="getting_started_guide_link">view the getting started guide</string>
+    <string name="no_tunnels_yet">Nothing here… yet.</string>
 </resources>

app/src/main/res/values-cs/strings.xml

@@ -21,6 +21,7 @@
     <string name="preshared_key">Předsdílený klíč</string>
     <string name="seconds">s</string>
     <string name="cancel">Zrušit</string>
+    <string name="enabled_app_shortcuts">Zapnout zkratky aplikací</string>
     <string name="unknown_error">Došlo k neznámé chybě</string>
     <string name="tunnel_on_wifi">Tunelovat na Wi-Fi</string>
     <string name="email_subject">WG Tunnel podpora</string>
@@ -64,6 +65,7 @@
     <string name="no_browser_detected">Žádný prohlížeč nebyl nalezen</string>
     <string name="pin_created">PIN úspěšně vytvořen</string>
     <string name="enter_pin">Zadejte PIN</string>
+    <string name="enable_app_lock">Zapnout zámek aplikace</string>
     <string name="settings">Nastavení</string>
     <string name="support">Podpora</string>
     <string name="app_name">WG Tunnel</string>
@@ -88,6 +90,7 @@
     <string name="primary_tunnel">Výchozí tunel</string>
     <string name="skip">Přeskočit</string>
     <string name="donate">Přispět na projekt</string>
+    <string name="stop_on_internet_loss">Zastavit tunel při ztrátě internetu</string>
     <string name="stop_on_no_internet">Zastavit při ztrátě internetu</string>
     <string name="native_kill_switch">Nativní kill switch</string>
     <string name="vpn_channel_description">Kanál pro oznámení o stavu VPN</string>
@@ -141,6 +144,7 @@
     <string name="vpn_denied_dialog_title">Oprávnění zamítnuto</string>
     <string name="app_permission_title">Ovládání tunelů a funkcí automatického tunelování</string>
     <string name="app_permission_description">https://hosted.weblate.org/translate/wg-tunnel/strings/en/?checksum=e52d7eb2e28a9a12 Ovládání funkcí tunelu a automatického tunelování.</string>
+    <string name="enable_remote_app_control">Povolit vzdálené ovládání aplikace</string>
     <string name="export_success">Export byl úspěšně dokončen</string>
     <string name="download">Stáhnout</string>
     <string name="check_for_update">Zkontrolovat aktualizaci</string>
@@ -245,7 +249,7 @@
     <string name="root_required_template">%1$s (vyžaduje root)</string>
     <string name="recommended_template">%1$s (doporučeno)</string>
     <string name="hint_template">(%1$s)</string>
-    <string name="backup_success">Úspěšně zazálohováno</string>
+    <string name="backup_success">Úspěšně zazálohováno. %1$s</string>
     <string name="config_error_template">Špatná konfigurace. %1$s v umístění: %2$s.</string>
     <string name="donation_dev_message">Jako jediný vývojář neúnavně pracuji na tom, aby se WG Tunnel stal nejlepším bezplatným a open-source WireGuard klientem pro Android, ale to je možné pouze s vaší podporou.</string>
     <string name="google_donation_message">Bohužel, kvůli pravidlům společnosti Google nejsou odkazy na darování povoleny ve verzi této aplikace z Obchodu Play. Projděte si prosím webové stránky projektu, abyste zjistili, kde můžete přispět.</string>
@@ -272,6 +276,7 @@
     <string name="back">Zpět</string>
     <string name="already_donated">Již darováno</string>
     <string name="selected">Vybrané</string>
+    <string name="global_split_tunneling">Globální dělené tunelování</string>
     <string name="active_network">Aktivní síť:</string>
     <string name="delete_active_message">Aktivní tunel nelze odstranit.</string>
     <string name="help_translate">Pomozte s překladem aplikace</string>
@@ -279,6 +284,7 @@
     <string name="other">Ostatní</string>
     <string name="kill_switch">kill switch</string>
     <string name="configuration">Konfigurace</string>
+    <string name="global_dns_servers">Globální DNS servery</string>
     <string name="contact">Kontakt</string>
     <string name="backup_and_restore">Zálohování a obnovení</string>
     <string name="about">O aplikaci</string>
@@ -385,6 +391,7 @@
     <string name="dns_error_empty">Endpoint cannot be empty</string>
     <string name="tunnel_state_connected">Connected</string>
     <string name="dns_error_invalid_scheme">DoH must use HTTPS</string>
+    <string name="configuration_globals">Configuration globals</string>
     <string name="private_dns_hostname">Private DNS: hostname (%1$s)</string>
     <string name="app">App</string>
     <string name="refresh_rate">Statistics refresh rate</string>
@@ -426,6 +433,7 @@
     <string name="included_apps">%1$s apps included</string>
     <string name="error_http_port_unavailable">HTTP listener port %1$d is already in use.\nPlease choose a different port.</string>
     <string name="current_system_dns">Current system DNS</string>
+    <string name="global_amnezia_configuration">Global Amnezia configuration</string>
     <string name="security">Security</string>
     <string name="more_options">More options</string>
     <string name="status_template">status: %1$s</string>
@@ -459,4 +467,7 @@
     <string name="i4" translatable="false">I4</string>
     <string name="s1" translatable="false">S1</string>
     <string name="h4" translatable="false">H4</string>
+    <string name="getting_started_guidance">Use the + button to import a tunnel, or view the getting started guide.</string>
+    <string name="getting_started_guide_link">view the getting started guide</string>
+    <string name="no_tunnels_yet">Nothing here… yet.</string>
 </resources>

app/src/main/res/values-da/strings.xml

@@ -17,6 +17,7 @@
     <string name="delete_tunnel">Delete tunnel</string>
     <string name="tunnel_mobile_data">Tunnel on mobile data</string>
     <string name="logs">Logs</string>
+    <string name="enable_app_lock">Enable app lock</string>
     <string name="config_changes_saved">Configuration changes saved.</string>
     <string name="join_telegram">Join Telegram community</string>
     <string name="pin_created">Pin successfully created</string>
@@ -28,6 +29,7 @@
     <string name="remote_key">Remote key</string>
     <string name="mobile_data">Mobile data</string>
     <string name="use_shell_via_shizuku">Use shell via Shizuku to get Wi-Fi information, preventing the need for location permission on non-rooted devices</string>
+    <string name="stop_on_internet_loss">Stop tunnel on internet loss</string>
     <string name="vpn">VPN</string>
     <string name="tunnel_boot_description">Start the default tunnel on boot</string>
     <string name="allow_lan_traffic">Allow LAN traffic</string>
@@ -60,7 +62,7 @@
     <string name="wifi_settings">Wi-Fi settings</string>
     <string name="tunnel_on_wifi">Tunnel on Wi-Fi</string>
     <string name="add_peer">Add peer</string>
-    <string name="backup_success">Backup success</string>
+    <string name="backup_success">Backup success. %1$s</string>
     <string name="persistent_keepalive">Persistent keepalive</string>
     <string name="info">Info</string>
     <string name="exclude">Exclude</string>
@@ -133,6 +135,7 @@
     <string name="kofi">Ko-fi</string>
     <string name="donation_signoff">Gratefully,</string>
     <string name="selected">Selected</string>
+    <string name="global_split_tunneling">Global split tunneling</string>
     <string name="active_network">Active Network:</string>
     <string name="range_hint">(%1$d–%2$d)</string>
     <string name="delete_active_message">Cannot delete active tunnel.</string>
@@ -155,6 +158,7 @@
     <string name="mtu">MTU</string>
     <string name="configuration">Configuration</string>
     <string name="drag_handle">Drag Handle</string>
+    <string name="global_dns_servers">Global DNS servers</string>
     <string name="display_theme">Display theme</string>
     <string name="contact">Contact</string>
     <string name="ports_must_differ">Failed. Proxies must have different ports.</string>
@@ -254,6 +258,7 @@
     <string name="unavailable_in_mode">Unavailable in current mode</string>
     <string name="server_port">Server:Port</string>
     <string name="camera_permission_required">Camera permission required</string>
+    <string name="enabled_app_shortcuts">Enable app shortcuts</string>
     <string name="preferred_tunnel">Preferred tunnel</string>
     <string name="allow">Allow</string>
     <string name="underload_packet_magic_header">Underload packet magic header</string>
@@ -268,6 +273,7 @@
     <string name="settings">Settings</string>
     <string name="incorrect_pin">Pin is incorrect</string>
     <string name="export_failed">Export failed</string>
+    <string name="enable_remote_app_control">Enable remote app control</string>
     <string name="donation_closing">It\'s my dream to work for you on this project full-time.</string>
     <string name="update_download_failed">Update download failed.</string>
     <string name="network_name">Network:</string>
@@ -385,6 +391,7 @@
     <string name="dns_error_empty">Endpoint cannot be empty</string>
     <string name="tunnel_state_connected">Connected</string>
     <string name="dns_error_invalid_scheme">DoH must use HTTPS</string>
+    <string name="configuration_globals">Configuration globals</string>
     <string name="private_dns_hostname">Private DNS: hostname (%1$s)</string>
     <string name="app">App</string>
     <string name="refresh_rate">Statistics refresh rate</string>
@@ -426,6 +433,7 @@
     <string name="included_apps">%1$s apps included</string>
     <string name="error_http_port_unavailable">HTTP listener port %1$d is already in use.\nPlease choose a different port.</string>
     <string name="current_system_dns">Current system DNS</string>
+    <string name="global_amnezia_configuration">Global Amnezia configuration</string>
     <string name="security">Security</string>
     <string name="more_options">More options</string>
     <string name="status_template">status: %1$s</string>
@@ -459,4 +467,7 @@
     <string name="i4" translatable="false">I4</string>
     <string name="s1" translatable="false">S1</string>
     <string name="h4" translatable="false">H4</string>
+    <string name="getting_started_guidance">Use the + button to import a tunnel, or view the getting started guide.</string>
+    <string name="getting_started_guide_link">view the getting started guide</string>
+    <string name="no_tunnels_yet">Nothing here… yet.</string>
 </resources>

app/src/main/res/values-de/strings.xml

@@ -37,6 +37,7 @@
     <string name="base64_key">base64-Schlüssel</string>
     <string name="delete_tunnel">Tunnel löschen</string>
     <string name="persistent_keepalive">Dauerhaftes Keepalive</string>
+    <string name="enable_app_lock">App-Sperre aktivieren</string>
     <string name="interface_">Schnittstelle</string>
     <string name="listen_port">Eingehender Port</string>
     <string name="random">(zufällig)</string>
@@ -44,6 +45,7 @@
     <string name="seconds">Sekunden</string>
     <string name="cancel">Abbrechen</string>
     <string name="preshared_key">Geteilter Schlüssel</string>
+    <string name="enabled_app_shortcuts">App-Verknüpfungen aktivieren</string>
     <string name="tunnel_on_wifi">Tunnel bei WLAN</string>
     <string name="email_subject">WG Tunnel Unterstützung</string>
     <string name="docs_description">Dokumentation lesen</string>
@@ -123,6 +125,7 @@
     <string name="pre_down">Vor Deaktivierung</string>
     <string name="post_down">Nach Deaktivierung</string>
     <string name="quick_actions">Schnellaktionen</string>
+    <string name="stop_on_internet_loss">Stoppen, wenn die Internetverbindung getrennt wird</string>
     <string name="bypass_lan_for_kill_switch">LAN umgehen für Notschalter</string>
     <string name="hide_scripts">Skripte verbergen</string>
     <string name="enable_amnezia_compatibility">Amnezia Kompatibilität aktivieren</string>
@@ -150,6 +153,7 @@
     <string name="copy">Kopieren</string>
     <string name="service_running_error">Dienst läuft nicht</string>
     <string name="auth_error">Nicht autorisiert</string>
+    <string name="enable_remote_app_control">App-Fernsteuerung aktivieren</string>
     <string name="export_failed">Export fehlgeschlagen</string>
     <string name="app_permission_description">https://hosted.weblate.org/translate/wg-tunnel/strings/en/?checksum=e52d7eb2e28a9a12Steuere Tunnel und Auto-Tunnel Funktionen.</string>
     <string name="dns_resolve_error">DNS-Auflösung fehlgeschlagen</string>
@@ -202,7 +206,7 @@
     <string name="auto_tunnel_running">Auto-Tunnel läuft</string>
     <string name="auto_tunnel_not_running">Auto-Tunnel läuft nicht</string>
     <string name="tunnel_monitoring">Tunnelüberwachung</string>
-    <string name="backup_success">Backuperfolg</string>
+    <string name="backup_success">Backuperfolg. %1$s</string>
     <string name="restore_success">Wiederherstellerfolg. %1$s</string>
     <string name="restarting_app">Starte App neu, um Änderungen anzuwenden …</string>
     <string name="restore_failed">Wiederherstellung aus Backup fehlgeschlagen.</string>
@@ -277,12 +281,14 @@
     <string name="resources">Resourcen</string>
     <string name="back">Zurück</string>
     <string name="already_donated">Bereits gespendet</string>
+    <string name="global_split_tunneling">Globales Split-Tunneling</string>
     <string name="active_network">Aktives Netzwerk:</string>
     <string name="help_translate">Hilf mit, die App zu übersetzen</string>
     <string name="ethernet">Ethernet</string>
     <string name="other">Sonstiges</string>
     <string name="kill_switch">Notschalter</string>
     <string name="configuration">Konfiguration</string>
+    <string name="global_dns_servers">Globale DNS Server</string>
     <string name="contact">Kontakt</string>
     <string name="backup_and_restore">Sichern und Wiederherstellen</string>
     <string name="about">Über</string>
@@ -385,6 +391,7 @@
     <string name="dns_error_empty">Endpoint cannot be empty</string>
     <string name="tunnel_state_connected">Connected</string>
     <string name="dns_error_invalid_scheme">DoH must use HTTPS</string>
+    <string name="configuration_globals">Configuration globals</string>
     <string name="private_dns_hostname">Private DNS: hostname (%1$s)</string>
     <string name="app">App</string>
     <string name="refresh_rate">Statistics refresh rate</string>
@@ -426,6 +433,7 @@
     <string name="included_apps">%1$s apps included</string>
     <string name="error_http_port_unavailable">HTTP listener port %1$d is already in use.\nPlease choose a different port.</string>
     <string name="current_system_dns">Current system DNS</string>
+    <string name="global_amnezia_configuration">Global Amnezia configuration</string>
     <string name="security">Security</string>
     <string name="more_options">More options</string>
     <string name="status_template">status: %1$s</string>
@@ -459,4 +467,7 @@
     <string name="i4" translatable="false">I4</string>
     <string name="s1" translatable="false">S1</string>
     <string name="h4" translatable="false">H4</string>
+    <string name="getting_started_guidance">Use the + button to import a tunnel, or view the getting started guide.</string>
+    <string name="getting_started_guide_link">view the getting started guide</string>
+    <string name="no_tunnels_yet">Nothing here… yet.</string>
 </resources>

app/src/main/res/values-es/strings.xml

@@ -41,6 +41,7 @@
     <string name="optional">(opcional)</string>
     <string name="seconds">Segundos</string>
     <string name="cancel">Cancelar</string>
+    <string name="enabled_app_shortcuts">Habilitar acesos directos de app</string>
     <string name="unknown_error">Error desconocido</string>
     <string name="email_subject">Ayuda de WG Tunnel</string>
     <string name="interface_">Interfaz</string>
@@ -64,6 +65,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">Activar el bloqueo de aplicaciones</string>
     <string name="set_primary_tunnel">Establecer como túnel Principal</string>
     <string name="edit_tunnel">Editar túnel</string>
     <string name="settings">Ajustes</string>
@@ -119,6 +121,7 @@
     <string name="learn_more">Saber más</string>
     <string name="wildcards_active">Comodines activos</string>
     <string name="stop_on_no_internet">Detener cuando no hay internet</string>
+    <string name="stop_on_internet_loss">Detener túnel cuando se pierda el internet</string>
     <string name="native_kill_switch">Interruptor de apagado nativo</string>
     <string name="allow_lan_traffic">Permitir tráfico LAN</string>
     <string name="bypass_lan_for_kill_switch">Excluir LAN del interruptor de apagado</string>
@@ -163,6 +166,7 @@
     <string name="check_for_update">Comprobar actualización</string>
     <string name="update_check_failed">Fallo al comprobar la actualización.</string>
     <string name="flavor_template">Variante: %1$s</string>
+    <string name="enable_remote_app_control">Activar control remoto de la app</string>
     <string name="export_success">Exportación completada</string>
     <string name="download">Descargar</string>
     <string name="latest_installed">Ya se está ejecutando la última versión.</string>
@@ -202,7 +206,7 @@
     <string name="auto_tunnel_running">El túnel automático está activo</string>
     <string name="auto_tunnel_not_running">El túnel automático no está activo</string>
     <string name="tunnel_monitoring">Monitoreo del túnel</string>
-    <string name="backup_success">Copia de seguridad realizada con éxito</string>
+    <string name="backup_success">Copia de seguridad realizada con éxito. %1$s</string>
     <string name="restore_success">Restauración completada. %1$s</string>
     <string name="restarting_app">Reiniciando la app para aplicar los cambios…</string>
     <string name="restore_failed">No se pudo restaurar la copia de seguridad.</string>
@@ -276,12 +280,14 @@
     <string name="resources">Recursos</string>
     <string name="back">Atrás</string>
     <string name="already_donated">Ya he donado</string>
+    <string name="global_split_tunneling">Túnel dividido global</string>
     <string name="active_network">Red activa:</string>
     <string name="help_translate">Ayuda a traducir la app</string>
     <string name="ethernet">Ethernet</string>
     <string name="other">Otros</string>
     <string name="kill_switch">kill switch</string>
     <string name="configuration">Configuración</string>
+    <string name="global_dns_servers">Servidores DNS globales</string>
     <string name="contact">Contacto</string>
     <string name="backup_and_restore">Copia de seguridad/Restaurar</string>
     <string name="about">Acerca de</string>
@@ -385,6 +391,7 @@
     <string name="dns_error_empty">Endpoint cannot be empty</string>
     <string name="tunnel_state_connected">Connected</string>
     <string name="dns_error_invalid_scheme">DoH must use HTTPS</string>
+    <string name="configuration_globals">Configuration globals</string>
     <string name="private_dns_hostname">Private DNS: hostname (%1$s)</string>
     <string name="app">App</string>
     <string name="refresh_rate">Statistics refresh rate</string>
@@ -426,6 +433,7 @@
     <string name="included_apps">%1$s apps included</string>
     <string name="error_http_port_unavailable">HTTP listener port %1$d is already in use.\nPlease choose a different port.</string>
     <string name="current_system_dns">Current system DNS</string>
+    <string name="global_amnezia_configuration">Global Amnezia configuration</string>
     <string name="security">Security</string>
     <string name="more_options">More options</string>
     <string name="status_template">status: %1$s</string>
@@ -459,4 +467,7 @@
     <string name="i4" translatable="false">I4</string>
     <string name="s1" translatable="false">S1</string>
     <string name="h4" translatable="false">H4</string>
+    <string name="getting_started_guidance">Use the + button to import a tunnel, or view the getting started guide.</string>
+    <string name="getting_started_guide_link">view the getting started guide</string>
+    <string name="no_tunnels_yet">Nothing here… yet.</string>
 </resources>

app/src/main/res/values-et/strings.xml

@@ -47,6 +47,7 @@
     <string name="allow">Luba</string>
     <string name="select_all">Vali kõik</string>
     <string name="export_success">Eksportimine õnnestus</string>
+    <string name="enable_remote_app_control">Luba rakenduse kaugjuhtimine</string>
     <string name="add_from_url">Lisa võrguaadressilt</string>
     <string name="enter_config_url">Sisesta seadistuse võrguaadress</string>
     <string name="error_download_failed">Seadistuse allalaadimine ei õnnestunud</string>
@@ -150,6 +151,8 @@
     <string name="splt_tunneling">Jagatud tunneldus</string>
     <string name="stop">Peata</string>
     <string name="stop_on_no_internet">Peata internetiühenduse puudumisel</string>
+    <string name="stop_on_internet_loss">Peata tunnel internetiühenduse kadumisel</string>
+    <string name="enable_app_lock">Luba rakenduse lukustamine</string>
     <string name="launch_app_settings">Käivita rakenduse seadistused</string>
     <string name="use_wildcards">Kasuta nimedes metamärke</string>
     <string name="wildcards_active">Metamärgid on kasutusel</string>
@@ -178,6 +181,7 @@
     <string name="_default">Vaikimisi meetod</string>
     <string name="wifi_detection_method">WiFi tuvastamise meetod</string>
     <string name="current_template">Praegune: %1$s</string>
+    <string name="enabled_app_shortcuts">Luba rakenduse otseteed</string>
     <string name="auto_tunnel_title">Tunneli automaatne loomine</string>
     <string name="auto_tunnel_not_running">Tunneli automaatne käivitamine pole kasutusel</string>
     <string name="auto_tunnel_running">Tunneli automaatne käivitamine on kasutusel</string>
@@ -194,7 +198,7 @@
     <string name="recommended_template">%1$s (soovitatav)</string>
     <string name="hint_template">(%1$s)</string>
     <string name="tunnel_monitoring">Tunnelo monitooring</string>
-    <string name="backup_success">Varundus õnnestus</string>
+    <string name="backup_success">Varundus õnnestus. %1$s</string>
     <string name="restore_success">Taastamine õnnestus. %1$s</string>
     <string name="restarting_app">Muudatuste jõustamiseks taaskäivitan rakenduse…</string>
     <string name="restore_failed">Varukoopiast taastamine ei õnnestunud.</string>
@@ -276,12 +280,14 @@
     <string name="resources">Ressursid</string>
     <string name="back">Tagasi</string>
     <string name="already_donated">Juba annetasin</string>
+    <string name="global_split_tunneling">Üldine jagatud tunneldus</string>
     <string name="active_network">Aktiivne võrk:</string>
     <string name="help_translate">Aita seda rakendust tõlkida</string>
     <string name="ethernet">Ethernet</string>
     <string name="other">Muu</string>
     <string name="kill_switch">kiirpeatamine</string>
     <string name="configuration">Seadistused</string>
+    <string name="global_dns_servers">Üldised nimeserverid</string>
     <string name="contact">Kontakt</string>
     <string name="backup_and_restore">Varundus ja taastamine</string>
     <string name="about">Rakenduse teave</string>
@@ -385,6 +391,7 @@
     <string name="dns_error_empty">Endpoint cannot be empty</string>
     <string name="tunnel_state_connected">Connected</string>
     <string name="dns_error_invalid_scheme">DoH must use HTTPS</string>
+    <string name="configuration_globals">Configuration globals</string>
     <string name="private_dns_hostname">Private DNS: hostname (%1$s)</string>
     <string name="app">App</string>
     <string name="refresh_rate">Statistics refresh rate</string>
@@ -426,6 +433,7 @@
     <string name="included_apps">%1$s apps included</string>
     <string name="error_http_port_unavailable">HTTP listener port %1$d is already in use.\nPlease choose a different port.</string>
     <string name="current_system_dns">Current system DNS</string>
+    <string name="global_amnezia_configuration">Global Amnezia configuration</string>
     <string name="security">Security</string>
     <string name="more_options">More options</string>
     <string name="status_template">status: %1$s</string>
@@ -459,4 +467,7 @@
     <string name="i4" translatable="false">I4</string>
     <string name="s1" translatable="false">S1</string>
     <string name="h4" translatable="false">H4</string>
+    <string name="getting_started_guidance">Use the + button to import a tunnel, or view the getting started guide.</string>
+    <string name="getting_started_guide_link">view the getting started guide</string>
+    <string name="no_tunnels_yet">Nothing here… yet.</string>
 </resources>

app/src/main/res/values-fa/strings.xml

@@ -27,6 +27,7 @@
     <string name="save">Save</string>
     <string name="delete_tunnel">Delete tunnel</string>
     <string name="logs">Logs</string>
+    <string name="enable_app_lock">Enable app lock</string>
     <string name="config_changes_saved">Configuration changes saved.</string>
     <string name="join_telegram">Join Telegram community</string>
     <string name="pin_created">Pin successfully created</string>
@@ -38,6 +39,7 @@
     <string name="remote_key">Remote key</string>
     <string name="mobile_data">Mobile data</string>
     <string name="use_shell_via_shizuku">Use shell via Shizuku to get Wi-Fi information, preventing the need for location permission on non-rooted devices</string>
+    <string name="stop_on_internet_loss">Stop tunnel on internet loss</string>
     <string name="vpn">VPN</string>
     <string name="tunnel_boot_description">Start the default tunnel on boot</string>
     <string name="allow_lan_traffic">Allow LAN traffic</string>
@@ -70,7 +72,7 @@
     <string name="wifi_settings">Wi-Fi settings</string>
     <string name="tunnel_on_wifi">Tunnel on Wi-Fi</string>
     <string name="add_peer">Add peer</string>
-    <string name="backup_success">Backup success</string>
+    <string name="backup_success">Backup success. %1$s</string>
     <string name="persistent_keepalive">Persistent keepalive</string>
     <string name="info">Info</string>
     <string name="exclude">Exclude</string>
@@ -141,6 +143,7 @@
     <string name="kofi">Ko-fi</string>
     <string name="donation_signoff">Gratefully,</string>
     <string name="selected">Selected</string>
+    <string name="global_split_tunneling">Global split tunneling</string>
     <string name="active_network">Active Network:</string>
     <string name="range_hint">(%1$d–%2$d)</string>
     <string name="delete_active_message">Cannot delete active tunnel.</string>
@@ -162,6 +165,7 @@
     <string name="mtu">MTU</string>
     <string name="configuration">Configuration</string>
     <string name="drag_handle">Drag Handle</string>
+    <string name="global_dns_servers">Global DNS servers</string>
     <string name="display_theme">Display theme</string>
     <string name="contact">Contact</string>
     <string name="ports_must_differ">Failed. Proxies must have different ports.</string>
@@ -255,6 +259,7 @@
     <string name="unavailable_in_mode">Unavailable in current mode</string>
     <string name="server_port">Server:Port</string>
     <string name="camera_permission_required">Camera permission required</string>
+    <string name="enabled_app_shortcuts">Enable app shortcuts</string>
     <string name="preferred_tunnel">Preferred tunnel</string>
     <string name="allow">Allow</string>
     <string name="underload_packet_magic_header">Underload packet magic header</string>
@@ -269,6 +274,7 @@
     <string name="settings">Settings</string>
     <string name="incorrect_pin">Pin is incorrect</string>
     <string name="export_failed">Export failed</string>
+    <string name="enable_remote_app_control">Enable remote app control</string>
     <string name="donation_closing">It\'s my dream to work for you on this project full-time.</string>
     <string name="update_download_failed">Update download failed.</string>
     <string name="network_name">Network:</string>
@@ -385,6 +391,7 @@
     <string name="dns_error_empty">Endpoint cannot be empty</string>
     <string name="tunnel_state_connected">Connected</string>
     <string name="dns_error_invalid_scheme">DoH must use HTTPS</string>
+    <string name="configuration_globals">Configuration globals</string>
     <string name="private_dns_hostname">Private DNS: hostname (%1$s)</string>
     <string name="app">App</string>
     <string name="refresh_rate">Statistics refresh rate</string>
@@ -426,6 +433,7 @@
     <string name="included_apps">%1$s apps included</string>
     <string name="error_http_port_unavailable">HTTP listener port %1$d is already in use.\nPlease choose a different port.</string>
     <string name="current_system_dns">Current system DNS</string>
+    <string name="global_amnezia_configuration">Global Amnezia configuration</string>
     <string name="security">Security</string>
     <string name="more_options">More options</string>
     <string name="status_template">status: %1$s</string>
@@ -459,4 +467,7 @@
     <string name="i4" translatable="false">I4</string>
     <string name="s1" translatable="false">S1</string>
     <string name="h4" translatable="false">H4</string>
+    <string name="getting_started_guidance">Use the + button to import a tunnel, or view the getting started guide.</string>
+    <string name="getting_started_guide_link">view the getting started guide</string>
+    <string name="no_tunnels_yet">Nothing here… yet.</string>
 </resources>

app/src/main/res/values-fi/strings.xml

@@ -47,6 +47,7 @@
     <string name="pin_created">Pin luotu</string>
     <string name="enter_pin">Syötä pin-koodi</string>
     <string name="create_pin">Luo pin-koodi</string>
+    <string name="enable_app_lock">Ota käyttöön sovelluksen lukitus</string>
     <string name="set_primary_tunnel">Aseta ensisijaiseksi tunneliksi</string>
     <string name="edit_tunnel">Muokkaa tunnelia</string>
     <string name="settings">Asetukset</string>
@@ -86,6 +87,7 @@
     <string name="add_wifi_name">Lisää WIFI:n nimi</string>
     <string name="language">Kieli</string>
     <string name="include">Sisällytä</string>
+    <string name="enabled_app_shortcuts">Salli sovelluksen pikakuvakkeet</string>
     <string name="automatic">Automaattinen</string>
     <string name="tunnel_name">Tunnelin nimi</string>
     <string name="restart_at_boot">Käynnistä laitteen käynnistyksen yhteydessä</string>
@@ -112,6 +114,7 @@
     <string name="remote_key">Remote key</string>
     <string name="mobile_data">Mobile data</string>
     <string name="use_shell_via_shizuku">Use shell via Shizuku to get Wi-Fi information, preventing the need for location permission on non-rooted devices</string>
+    <string name="stop_on_internet_loss">Stop tunnel on internet loss</string>
     <string name="vpn">VPN</string>
     <string name="tunnel_boot_description">Start the default tunnel on boot</string>
     <string name="google_donation_message">Unfortunately, due to Google\'s policies, donation links are not allowed in the Play Store version of this app. Please browse the project\'s webpages to find where to donate.</string>
@@ -136,7 +139,7 @@
     <string name="show_qr">Show QR</string>
     <string name="wifi_settings">Wi-Fi settings</string>
     <string name="add_peer">Add peer</string>
-    <string name="backup_success">Backup success</string>
+    <string name="backup_success">Backup success. %1$s</string>
     <string name="persistent_keepalive">Persistent keepalive</string>
     <string name="info">Info</string>
     <string name="backup_failed">Failed to create backup.</string>
@@ -184,6 +187,7 @@
     <string name="kofi">Ko-fi</string>
     <string name="donation_signoff">Gratefully,</string>
     <string name="selected">Selected</string>
+    <string name="global_split_tunneling">Global split tunneling</string>
     <string name="active_network">Active Network:</string>
     <string name="range_hint">(%1$d–%2$d)</string>
     <string name="delete_active_message">Cannot delete active tunnel.</string>
@@ -199,6 +203,7 @@
     <string name="kill_switch">kill switch</string>
     <string name="configuration">Configuration</string>
     <string name="drag_handle">Drag Handle</string>
+    <string name="global_dns_servers">Global DNS servers</string>
     <string name="contact">Contact</string>
     <string name="ports_must_differ">Failed. Proxies must have different ports.</string>
     <string name="join_matrix">Join Matrix community</string>
@@ -277,6 +282,7 @@
     <string name="fix">Fix</string>
     <string name="tunnel_running_name_message">Name unchangeable while tunnel is active.</string>
     <string name="export_failed">Export failed</string>
+    <string name="enable_remote_app_control">Enable remote app control</string>
     <string name="donation_closing">It\'s my dream to work for you on this project full-time.</string>
     <string name="update_download_failed">Update download failed.</string>
     <string name="network_name">Network:</string>
@@ -385,6 +391,7 @@
     <string name="dns_error_empty">Endpoint cannot be empty</string>
     <string name="tunnel_state_connected">Connected</string>
     <string name="dns_error_invalid_scheme">DoH must use HTTPS</string>
+    <string name="configuration_globals">Configuration globals</string>
     <string name="private_dns_hostname">Private DNS: hostname (%1$s)</string>
     <string name="app">App</string>
     <string name="refresh_rate">Statistics refresh rate</string>
@@ -426,6 +433,7 @@
     <string name="included_apps">%1$s apps included</string>
     <string name="error_http_port_unavailable">HTTP listener port %1$d is already in use.\nPlease choose a different port.</string>
     <string name="current_system_dns">Current system DNS</string>
+    <string name="global_amnezia_configuration">Global Amnezia configuration</string>
     <string name="security">Security</string>
     <string name="more_options">More options</string>
     <string name="status_template">status: %1$s</string>
@@ -459,4 +467,7 @@
     <string name="i4" translatable="false">I4</string>
     <string name="s1" translatable="false">S1</string>
     <string name="h4" translatable="false">H4</string>
+    <string name="getting_started_guidance">Use the + button to import a tunnel, or view the getting started guide.</string>
+    <string name="getting_started_guide_link">view the getting started guide</string>
+    <string name="no_tunnels_yet">Nothing here… yet.</string>
 </resources>

app/src/main/res/values-fr/strings.xml

@@ -71,6 +71,7 @@
     <string name="show_amnezia_properties">Voir les propriétés d\'Amnezia</string>
     <string name="never">Jamais</string>
     <string name="logs">Journaux</string>
+    <string name="enabled_app_shortcuts">Activer les raccourcis</string>
     <string name="unknown_error">Une erreur inconnue s\'est produite</string>
     <string name="email_subject">Assistance WG Tunnel</string>
     <string name="yes">Oui</string>
@@ -78,6 +79,7 @@
     <string name="set_primary_tunnel">Tunnel utilisé quand aucun tunnel favori n\'est défini</string>
     <string name="auto">(Auto)</string>
     <string name="pin_created">Code PIN bien créé</string>
+    <string name="enable_app_lock">Activer le verrouillage de l\'appli</string>
     <string name="edit_tunnel">Éditer le tunnel</string>
     <string name="settings">Réglages</string>
     <string name="junk_packet_count">Nombre de paquets indésirables</string>
@@ -116,6 +118,7 @@
     <string name="remove_amnezia_compatibility">Retirer la prise en charge d\'Amnezia</string>
     <string name="hide_amnezia_properties">Cacher les propriétés d\'Amnezia</string>
     <string name="stop_on_no_internet">Arrêt en l\'absence d\'internet</string>
+    <string name="stop_on_internet_loss">Couper les tunnels en l\'absence d\'internet</string>
     <string name="native_kill_switch">Arrêt d\'urgence natif</string>
     <string name="allow_lan_traffic">Autoriser le trafic LAN</string>
     <string name="bypass_lan_for_kill_switch">Contourner le LAN en cas d\'arrêt d\'urgence</string>
@@ -171,7 +174,7 @@
     <string name="mimic_quic">Imiter QUIC</string>
     <string name="show_qr">Afficher le QR</string>
     <string name="wifi_settings">Paramètres Wi-Fi</string>
-    <string name="backup_success">Sauvegarde réussie</string>
+    <string name="backup_success">Sauvegarde réussie. %1$s</string>
     <string name="info">Info</string>
     <string name="backup_failed">Échec de la création de la sauvegarde.</string>
     <string name="location_permissions">Permissions de localisation</string>
@@ -210,6 +213,7 @@
     <string name="kofi">Ko-fi</string>
     <string name="donation_signoff">Avec toute ma gratitude,</string>
     <string name="selected">Sélectionné</string>
+    <string name="global_split_tunneling">Tunneling sélectif global</string>
     <string name="active_network">Réseau actif:</string>
     <string name="range_hint">(%1$d–%2$d)</string>
     <string name="delete_active_message">Impossible de supprimer un tunnel actif.</string>
@@ -223,6 +227,7 @@
     <string name="kill_switch">kill switch</string>
     <string name="configuration">Configuration</string>
     <string name="drag_handle">Poignée de glissement</string>
+    <string name="global_dns_servers">Serveurs DNS global</string>
     <string name="contact">Contact</string>
     <string name="ports_must_differ">Échec. Les serveurs proxy doivent utiliser des ports différents.</string>
     <string name="backup_and_restore">Sauvegarde et restauration</string>
@@ -282,6 +287,7 @@
     <string name="fix">Corriger</string>
     <string name="tunnel_running_name_message">Le nom ne peut pas être modifié tant que le tunnel est actif.</string>
     <string name="export_failed">L\'exportation a échoué</string>
+    <string name="enable_remote_app_control">Activer le contrôle à distance des applications</string>
     <string name="donation_closing">Mon rêve serait de travailler à plein temps pour vous sur ce projet.</string>
     <string name="update_download_failed">La mise à jour n\'a pas pu être téléchargée.</string>
     <string name="network_name">Réseau:</string>
@@ -385,6 +391,7 @@
     <string name="dns_error_empty">Endpoint cannot be empty</string>
     <string name="tunnel_state_connected">Connected</string>
     <string name="dns_error_invalid_scheme">DoH must use HTTPS</string>
+    <string name="configuration_globals">Configuration globals</string>
     <string name="private_dns_hostname">Private DNS: hostname (%1$s)</string>
     <string name="app">App</string>
     <string name="refresh_rate">Statistics refresh rate</string>
@@ -426,6 +433,7 @@
     <string name="included_apps">%1$s apps included</string>
     <string name="error_http_port_unavailable">HTTP listener port %1$d is already in use.\nPlease choose a different port.</string>
     <string name="current_system_dns">Current system DNS</string>
+    <string name="global_amnezia_configuration">Global Amnezia configuration</string>
     <string name="security">Security</string>
     <string name="more_options">More options</string>
     <string name="status_template">status: %1$s</string>
@@ -459,4 +467,7 @@
     <string name="i4" translatable="false">I4</string>
     <string name="s1" translatable="false">S1</string>
     <string name="h4" translatable="false">H4</string>
+    <string name="getting_started_guidance">Use the + button to import a tunnel, or view the getting started guide.</string>
+    <string name="getting_started_guide_link">view the getting started guide</string>
+    <string name="no_tunnels_yet">Nothing here… yet.</string>
 </resources>

app/src/main/res/values-gsw/strings.xml

@@ -15,6 +15,7 @@
     <string name="delete_tunnel">Delete tunnel</string>
     <string name="tunnel_mobile_data">Tunnel on mobile data</string>
     <string name="logs">Logs</string>
+    <string name="enable_app_lock">Enable app lock</string>
     <string name="config_changes_saved">Configuration changes saved.</string>
     <string name="join_telegram">Join Telegram community</string>
     <string name="pin_created">Pin successfully created</string>
@@ -26,6 +27,7 @@
     <string name="remote_key">Remote key</string>
     <string name="mobile_data">Mobile data</string>
     <string name="use_shell_via_shizuku">Use shell via Shizuku to get Wi-Fi information, preventing the need for location permission on non-rooted devices</string>
+    <string name="stop_on_internet_loss">Stop tunnel on internet loss</string>
     <string name="vpn">VPN</string>
     <string name="tunnel_boot_description">Start the default tunnel on boot</string>
     <string name="allow_lan_traffic">Allow LAN traffic</string>
@@ -58,7 +60,7 @@
     <string name="wifi_settings">Wi-Fi settings</string>
     <string name="tunnel_on_wifi">Tunnel on Wi-Fi</string>
     <string name="add_peer">Add peer</string>
-    <string name="backup_success">Backup success</string>
+    <string name="backup_success">Backup success. %1$s</string>
     <string name="persistent_keepalive">Persistent keepalive</string>
     <string name="info">Info</string>
     <string name="exclude">Exclude</string>
@@ -132,6 +134,7 @@
     <string name="kofi">Ko-fi</string>
     <string name="donation_signoff">Gratefully,</string>
     <string name="selected">Selected</string>
+    <string name="global_split_tunneling">Global split tunneling</string>
     <string name="active_network">Active Network:</string>
     <string name="range_hint">(%1$d–%2$d)</string>
     <string name="delete_active_message">Cannot delete active tunnel.</string>
@@ -154,6 +157,7 @@
     <string name="mtu">MTU</string>
     <string name="configuration">Configuration</string>
     <string name="drag_handle">Drag Handle</string>
+    <string name="global_dns_servers">Global DNS servers</string>
     <string name="display_theme">Display theme</string>
     <string name="contact">Contact</string>
     <string name="ports_must_differ">Failed. Proxies must have different ports.</string>
@@ -255,6 +259,7 @@
     <string name="unavailable_in_mode">Unavailable in current mode</string>
     <string name="server_port">Server:Port</string>
     <string name="camera_permission_required">Camera permission required</string>
+    <string name="enabled_app_shortcuts">Enable app shortcuts</string>
     <string name="preferred_tunnel">Preferred tunnel</string>
     <string name="allow">Allow</string>
     <string name="underload_packet_magic_header">Underload packet magic header</string>
@@ -269,6 +274,7 @@
     <string name="settings">Settings</string>
     <string name="incorrect_pin">Pin is incorrect</string>
     <string name="export_failed">Export failed</string>
+    <string name="enable_remote_app_control">Enable remote app control</string>
     <string name="donation_closing">It\'s my dream to work for you on this project full-time.</string>
     <string name="update_download_failed">Update download failed.</string>
     <string name="network_name">Network:</string>
@@ -384,6 +390,7 @@
     <string name="dns_error_empty">Endpoint cannot be empty</string>
     <string name="tunnel_state_connected">Connected</string>
     <string name="dns_error_invalid_scheme">DoH must use HTTPS</string>
+    <string name="configuration_globals">Configuration globals</string>
     <string name="private_dns_hostname">Private DNS: hostname (%1$s)</string>
     <string name="app">App</string>
     <string name="refresh_rate">Statistics refresh rate</string>
@@ -425,6 +432,7 @@
     <string name="included_apps">%1$s apps included</string>
     <string name="error_http_port_unavailable">HTTP listener port %1$d is already in use.\nPlease choose a different port.</string>
     <string name="current_system_dns">Current system DNS</string>
+    <string name="global_amnezia_configuration">Global Amnezia configuration</string>
     <string name="security">Security</string>
     <string name="more_options">More options</string>
     <string name="status_template">status: %1$s</string>
@@ -458,4 +466,7 @@
     <string name="i4" translatable="false">I4</string>
     <string name="s1" translatable="false">S1</string>
     <string name="h4" translatable="false">H4</string>
+    <string name="getting_started_guidance">Use the + button to import a tunnel, or view the getting started guide.</string>
+    <string name="getting_started_guide_link">view the getting started guide</string>
+    <string name="no_tunnels_yet">Nothing here… yet.</string>
 </resources>

app/src/main/res/values-hu/strings.xml

@@ -17,6 +17,7 @@
     <string name="delete_tunnel">Alagút törlése</string>
     <string name="tunnel_mobile_data">Alagút mobiladat-forgalmon</string>
     <string name="logs">Naplók</string>
+    <string name="enable_app_lock">Alkalmazászár engedélyezése</string>
     <string name="config_changes_saved">Konfigurációs módosítások mentve.</string>
     <string name="join_telegram">Csatlakozás a Telegram közösséghez</string>
     <string name="pin_created">PIN-kód sikeresen létrehozva</string>
@@ -28,6 +29,7 @@
     <string name="remote_key">Távoli kulcs</string>
     <string name="mobile_data">Mobiladat</string>
     <string name="use_shell_via_shizuku">Shell használata Shizuku-n keresztül a Wi-Fi információkhoz, így nincs szükség helymeghatározási engedélyre nem rootolt eszközökön</string>
+    <string name="stop_on_internet_loss">Alagút leállítása az internet megszűnésekor</string>
     <string name="vpn">VPN</string>
     <string name="tunnel_boot_description">Alapértelmezett alagút indítása rendszerindításkor</string>
     <string name="allow_lan_traffic">LAN forgalom engedélyezése</string>
@@ -60,7 +62,7 @@
     <string name="wifi_settings">Wi-Fi beállítások</string>
     <string name="tunnel_on_wifi">Alagút Wi-Fi-n</string>
     <string name="add_peer">Peer hozzáadása</string>
-    <string name="backup_success">Sikeres mentés</string>
+    <string name="backup_success">Sikeres mentés. %1$s</string>
     <string name="persistent_keepalive">Kapcsolatmegőrzés</string>
     <string name="info">Infó</string>
     <string name="exclude">Kizárás</string>
@@ -133,6 +135,7 @@
     <string name="kofi">Ko-fi</string>
     <string name="donation_signoff">Hálával,</string>
     <string name="selected">Kiválasztva</string>
+    <string name="global_split_tunneling">Globális split tunneling</string>
     <string name="active_network">Aktív hálózat:</string>
     <string name="range_hint">(%1$d–%2$d)</string>
     <string name="delete_active_message">Aktív alagút nem törölhető.</string>
@@ -155,6 +158,7 @@
     <string name="mtu">MTU</string>
     <string name="configuration">Konfiguráció</string>
     <string name="drag_handle">Húzóka</string>
+    <string name="global_dns_servers">Globális DNS szerverek</string>
     <string name="display_theme">Megjelenítési téma</string>
     <string name="contact">Kapcsolat</string>
     <string name="ports_must_differ">Sikertelen. A proxyknak különböző portokat kell használniuk.</string>
@@ -254,6 +258,7 @@
     <string name="unavailable_in_mode">Nem érhető el a jelenlegi módban</string>
     <string name="server_port">Szerver:Port</string>
     <string name="camera_permission_required">Kamera engedély szükséges</string>
+    <string name="enabled_app_shortcuts">App gyorsindítók engedélyezése</string>
     <string name="preferred_tunnel">Preferált alagút</string>
     <string name="allow">Engedélyezés</string>
     <string name="underload_packet_magic_header">Underload csomag magic header</string>
@@ -268,6 +273,7 @@
     <string name="settings">Beállítások</string>
     <string name="incorrect_pin">A PIN-kód helytelen</string>
     <string name="export_failed">Exportálás sikertelen</string>
+    <string name="enable_remote_app_control">Távoli vezérlés engedélyezése</string>
     <string name="donation_closing">Minden álmom, hogy teljes munkaidőben ezen a projekten dolgozhassak.</string>
     <string name="update_download_failed">Frissítés letöltése sikertelen.</string>
     <string name="network_name">Hálózat:</string>
@@ -385,6 +391,7 @@
     <string name="dns_error_empty">Endpoint cannot be empty</string>
     <string name="tunnel_state_connected">Connected</string>
     <string name="dns_error_invalid_scheme">DoH must use HTTPS</string>
+    <string name="configuration_globals">Configuration globals</string>
     <string name="private_dns_hostname">Private DNS: hostname (%1$s)</string>
     <string name="app">App</string>
     <string name="refresh_rate">Statistics refresh rate</string>
@@ -426,6 +433,7 @@
     <string name="included_apps">%1$s apps included</string>
     <string name="error_http_port_unavailable">HTTP listener port %1$d is already in use.\nPlease choose a different port.</string>
     <string name="current_system_dns">Current system DNS</string>
+    <string name="global_amnezia_configuration">Global Amnezia configuration</string>
     <string name="security">Security</string>
     <string name="more_options">More options</string>
     <string name="status_template">status: %1$s</string>
@@ -459,4 +467,7 @@
     <string name="i4" translatable="false">I4</string>
     <string name="s1" translatable="false">S1</string>
     <string name="h4" translatable="false">H4</string>
+    <string name="getting_started_guidance">Use the + button to import a tunnel, or view the getting started guide.</string>
+    <string name="getting_started_guide_link">view the getting started guide</string>
+    <string name="no_tunnels_yet">Nothing here… yet.</string>
 </resources>

app/src/main/res/values-in/strings.xml

@@ -29,6 +29,7 @@
     <string name="seconds">Detik</string>
     <string name="persistent_keepalive">Keepalive persisten</string>
     <string name="cancel">Batal</string>
+    <string name="enabled_app_shortcuts">Aktifkan pintasan aplikasi</string>
     <string name="unknown_error">Terjadi kesalahan tidak dikenal</string>
     <string name="tunnel_on_wifi">Terowongan pada Wi-Fi</string>
     <string name="email_subject">Dukungan WG Tunnel</string>
@@ -63,6 +64,7 @@
     <string name="prominent_background_location_message">Fitur ini memerlukan izin lokasi latar belakang untuk mengaktifkan pemantauan SSID Wi-Fi bahkan saat aplikasi ditutup. Untuk detail selengkapnya, silakan lihat Kebijakan Privasi yang tertaut di layar Dukungan.</string>
     <string name="copy_public_key">Salin kunci publik</string>
     <string name="base64_key">Kunci Base64</string>
+    <string name="enable_app_lock">Aktifkan kunci aplikasi</string>
     <string name="delete_tunnel">Hapus terowongan</string>
     <string name="delete_tunnel_message">Apakah Anda yakin ingin menghapus terowongan yang dipilih?</string>
     <string name="no_email_detected">Tidak ada aplikasi email yang terdeteksi</string>
@@ -91,6 +93,7 @@
     <string name="remote_key">Kunci jarak jauh</string>
     <string name="mobile_data">Data seluler</string>
     <string name="use_shell_via_shizuku">Gunakan shell melalui Shizuku untuk mendapatkan informasi Wi-Fi, sehingga tidak memerlukan izin lokasi pada perangkat yang tidak di-root</string>
+    <string name="stop_on_internet_loss">Hentikan terowongan saat koneksi internet terputus</string>
     <string name="vpn">VPN</string>
     <string name="tunnel_boot_description">Mulai terowongan bawaan saat booting</string>
     <string name="allow_lan_traffic">Izinkan lalu lintas LAN</string>
@@ -116,7 +119,7 @@
     <string name="auto_tunnel_channel_description">Saluran untuk notifikasi status terowongan otomatis</string>
     <string name="show_qr">Tampilkan QR</string>
     <string name="wifi_settings">Pengaturan Wi-Fi</string>
-    <string name="backup_success">Pencadangan berhasil</string>
+    <string name="backup_success">Pencadangan berhasil. %1$s</string>
     <string name="info">Info</string>
     <string name="exclude">Kecualikan</string>
     <string name="backup_failed">Gagal membuat cadangan.</string>
@@ -171,6 +174,7 @@
     <string name="kofi">Ko-fi</string>
     <string name="donation_signoff">Dengan penuh rasa syukur,</string>
     <string name="selected">Dipilih</string>
+    <string name="global_split_tunneling">Terowongan terpisah global</string>
     <string name="active_network">Jaringan Aktif:</string>
     <string name="range_hint">(%1$d–%2$d)</string>
     <string name="delete_active_message">Tidak dapat menghapus terowongan yang sedang aktif.</string>
@@ -188,6 +192,7 @@
     <string name="mtu">MTU</string>
     <string name="configuration">Konfigurasi</string>
     <string name="drag_handle">Pegangan Seret</string>
+    <string name="global_dns_servers">Server DNS global</string>
     <string name="display_theme">Tema tampilan</string>
     <string name="contact">Kontak</string>
     <string name="ports_must_differ">Gagal. Proksi harus memiliki port yang berbeda.</string>
@@ -274,6 +279,7 @@
     <string name="fix">Perbaiki</string>
     <string name="tunnel_running_name_message">Nama tidak dapat diubah saat terowongan aktif.</string>
     <string name="export_failed">Ekspor gagal</string>
+    <string name="enable_remote_app_control">Aktifkan kontrol aplikasi jarak jauh</string>
     <string name="donation_closing">Impian saya adalah bekerja penuh waktu untuk Anda pada proyek ini.</string>
     <string name="update_download_failed">Unduhan pembaruan gagal.</string>
     <string name="network_name">Jaringan:</string>
@@ -385,6 +391,7 @@
     <string name="dns_error_empty">Endpoint cannot be empty</string>
     <string name="tunnel_state_connected">Connected</string>
     <string name="dns_error_invalid_scheme">DoH must use HTTPS</string>
+    <string name="configuration_globals">Configuration globals</string>
     <string name="private_dns_hostname">Private DNS: hostname (%1$s)</string>
     <string name="app">App</string>
     <string name="refresh_rate">Statistics refresh rate</string>
@@ -426,6 +433,7 @@
     <string name="included_apps">%1$s apps included</string>
     <string name="error_http_port_unavailable">HTTP listener port %1$d is already in use.\nPlease choose a different port.</string>
     <string name="current_system_dns">Current system DNS</string>
+    <string name="global_amnezia_configuration">Global Amnezia configuration</string>
     <string name="security">Security</string>
     <string name="more_options">More options</string>
     <string name="status_template">status: %1$s</string>
@@ -459,4 +467,7 @@
     <string name="i4" translatable="false">I4</string>
     <string name="s1" translatable="false">S1</string>
     <string name="h4" translatable="false">H4</string>
+    <string name="getting_started_guidance">Use the + button to import a tunnel, or view the getting started guide.</string>
+    <string name="getting_started_guide_link">view the getting started guide</string>
+    <string name="no_tunnels_yet">Nothing here… yet.</string>
 </resources>

app/src/main/res/values-it/strings.xml

@@ -13,6 +13,7 @@
     <string name="public_key">Chiave pubblica</string>
     <string name="addresses">Indirizzi</string>
     <string name="dns_servers">Server DNS</string>
+    <string name="enabled_app_shortcuts">Abilita le scorciatoie da app</string>
     <string name="email_subject">Supporto di Tunnel WG</string>
     <string name="email_chooser">Invia una email…</string>
     <string name="docs_description">Leggi la documentazione</string>
@@ -63,6 +64,7 @@
     <string name="no_browser_detected">Nessun browser rilevato</string>
     <string name="incorrect_pin">Il PIN non è corretto</string>
     <string name="pin_created">PIN correttamente creato</string>
+    <string name="enable_app_lock">Abilita blocco app</string>
     <string name="set_primary_tunnel">Tunnel utilizzato quando non è configurato alcun tunnel preferito</string>
     <string name="edit_tunnel">Modifica tunnel</string>
     <string name="settings">Impostazioni</string>
@@ -86,6 +88,7 @@
     <string name="prominent_background_location_message">Questa caratteristica richiede il permesso di localizzazione in background per abilitare il monitoraggio dell\'SSID delle reti Wi-fi anche quando l\'applicazione è chiusa. Per maggiori dettagli, consultare il link alla Privacy Policy presente nella schermata \"Supporto\".</string>
     <string name="auto_tunnel_title">Servizio tunneling automatico</string>
     <string name="use_root_shell_for_wifi">Utilizzare una shell root per ottenere le informazioni Wi-Fi, evitando la necessità dell\'autorizzazioni della posizione</string>
+    <string name="stop_on_internet_loss">Arresta il tunnel in caso di assenza di connessione internet</string>
     <string name="allow_lan_traffic">Abilita traffico LAN</string>
     <string name="tunnel_control">Controllo tunnel</string>
     <string name="include_lan">Includi la LAN</string>
@@ -155,6 +158,7 @@
     <string name="service_running_error">Il servizio non è in esecuzione</string>
     <string name="config_error">Configurazione non valida</string>
     <string name="dns_resolve_error">Risoluzione DNS fallita</string>
+    <string name="enable_remote_app_control">Abilita il controllo dell\'app da remoto</string>
     <string name="version_template">Versione: %1$s</string>
     <string name="flavor_template">Caratteristica: %1$s</string>
     <string name="update_available">Aggiornamento disponibile!</string>
@@ -206,7 +210,7 @@
     <string name="restore_failed">Impossibile ripristinare dal backup.</string>
     <string name="restarting_app">Riavviando l\'app per applicare le modifiche…</string>
     <string name="restore_success">Ripristino riuscito. %1$s</string>
-    <string name="backup_success">Bakcup riuscito</string>
+    <string name="backup_success">Bakcup riuscito. %1$s</string>
     <string name="current_template">Corrente: %1$s</string>
     <string name="root_required_template">%1$s (root richiesto)</string>
     <string name="recommended_template">%1$s (raccomandato)</string>
@@ -268,6 +272,7 @@
     <string name="back">Indietro</string>
     <string name="active_tunnel_update_failed">Aggiornamento tunnel attivo non riuscito</string>
     <string name="already_donated">Già donato</string>
+    <string name="global_split_tunneling">Tunneling diviso globale</string>
     <string name="active_network">Rete attiva:</string>
     <string name="help_translate">Aiuta a tradurre l\'app</string>
     <string name="ethernet">Ethernet</string>
@@ -275,6 +280,7 @@
     <string name="kill_switch">kill switch</string>
     <string name="configuration">Configurazione</string>
     <string name="drag_handle">Drag Handle</string>
+    <string name="global_dns_servers">Server DNS globali</string>
     <string name="contact">Contatti</string>
     <string name="backup_and_restore">Backup e ripristino</string>
     <string name="about">Informazioni</string>
@@ -385,6 +391,7 @@
     <string name="dns_error_empty">Endpoint cannot be empty</string>
     <string name="tunnel_state_connected">Connected</string>
     <string name="dns_error_invalid_scheme">DoH must use HTTPS</string>
+    <string name="configuration_globals">Configuration globals</string>
     <string name="private_dns_hostname">Private DNS: hostname (%1$s)</string>
     <string name="app">App</string>
     <string name="refresh_rate">Statistics refresh rate</string>
@@ -426,6 +433,7 @@
     <string name="included_apps">%1$s apps included</string>
     <string name="error_http_port_unavailable">HTTP listener port %1$d is already in use.\nPlease choose a different port.</string>
     <string name="current_system_dns">Current system DNS</string>
+    <string name="global_amnezia_configuration">Global Amnezia configuration</string>
     <string name="security">Security</string>
     <string name="more_options">More options</string>
     <string name="status_template">status: %1$s</string>
@@ -459,4 +467,7 @@
     <string name="i4" translatable="false">I4</string>
     <string name="s1" translatable="false">S1</string>
     <string name="h4" translatable="false">H4</string>
+    <string name="getting_started_guidance">Use the + button to import a tunnel, or view the getting started guide.</string>
+    <string name="getting_started_guide_link">view the getting started guide</string>
+    <string name="no_tunnels_yet">Nothing here… yet.</string>
 </resources>

app/src/main/res/values-ja/strings.xml

@@ -18,6 +18,7 @@
     <string name="cancel">キャンセル</string>
     <string name="unknown_error">不明なエラーが発生しました</string>
     <string name="error_no_file_explorer">ファイルエクスプローラーはインストールされていません</string>
+    <string name="enabled_app_shortcuts">アプリのショートカットを有効にする</string>
     <string name="no_email_detected">メールアプリは検出されません</string>
     <string name="email_description">メールを送る</string>
     <string name="no_browser_detected">ブラウザは検出されません</string>
@@ -54,6 +55,7 @@
     <string name="auto_tunnel_title">自動トンネルサービス</string>
     <string name="edit_tunnel">トンネルの編集</string>
     <string name="create_pin">新規PINを作成</string>
+    <string name="enable_app_lock">アプリロックを有効にする</string>
     <string name="always_on_message">VPN接続の許可が拒否されました。</string>
     <string name="always_on_message2">他のすべてのアプリで常時接続VPNがオフになっていることを確認して、再度お試しください</string>
     <string name="notifications">通知</string>
@@ -81,6 +83,7 @@
     <string name="remote_key">Remote key</string>
     <string name="mobile_data">Mobile data</string>
     <string name="use_shell_via_shizuku">Use shell via Shizuku to get Wi-Fi information, preventing the need for location permission on non-rooted devices</string>
+    <string name="stop_on_internet_loss">Stop tunnel on internet loss</string>
     <string name="vpn">VPN</string>
     <string name="tunnel_boot_description">Start the default tunnel on boot</string>
     <string name="allow_lan_traffic">Allow LAN traffic</string>
@@ -107,7 +110,7 @@
     <string name="auto_tunnel_channel_description">A channel for auto-tunnel state notifications</string>
     <string name="show_qr">Show QR</string>
     <string name="wifi_settings">Wi-Fi settings</string>
-    <string name="backup_success">Backup success</string>
+    <string name="backup_success">Backup success. %1$s</string>
     <string name="info">Info</string>
     <string name="backup_failed">Failed to create backup.</string>
     <string name="junk_packet_minimum_size">Junk packet minimum size</string>
@@ -164,6 +167,7 @@
     <string name="kofi">Ko-fi</string>
     <string name="donation_signoff">Gratefully,</string>
     <string name="selected">Selected</string>
+    <string name="global_split_tunneling">Global split tunneling</string>
     <string name="active_network">Active Network:</string>
     <string name="range_hint">(%1$d–%2$d)</string>
     <string name="delete_active_message">Cannot delete active tunnel.</string>
@@ -180,6 +184,7 @@
     <string name="kill_switch">kill switch</string>
     <string name="configuration">Configuration</string>
     <string name="drag_handle">Drag Handle</string>
+    <string name="global_dns_servers">Global DNS servers</string>
     <string name="display_theme">Display theme</string>
     <string name="contact">Contact</string>
     <string name="ports_must_differ">Failed. Proxies must have different ports.</string>
@@ -272,6 +277,7 @@
     <string name="fix">Fix</string>
     <string name="tunnel_running_name_message">Name unchangeable while tunnel is active.</string>
     <string name="export_failed">Export failed</string>
+    <string name="enable_remote_app_control">Enable remote app control</string>
     <string name="donation_closing">It\'s my dream to work for you on this project full-time.</string>
     <string name="update_download_failed">Update download failed.</string>
     <string name="network_name">Network:</string>
@@ -385,6 +391,7 @@
     <string name="dns_error_empty">Endpoint cannot be empty</string>
     <string name="tunnel_state_connected">Connected</string>
     <string name="dns_error_invalid_scheme">DoH must use HTTPS</string>
+    <string name="configuration_globals">Configuration globals</string>
     <string name="private_dns_hostname">Private DNS: hostname (%1$s)</string>
     <string name="app">App</string>
     <string name="refresh_rate">Statistics refresh rate</string>
@@ -426,6 +433,7 @@
     <string name="included_apps">%1$s apps included</string>
     <string name="error_http_port_unavailable">HTTP listener port %1$d is already in use.\nPlease choose a different port.</string>
     <string name="current_system_dns">Current system DNS</string>
+    <string name="global_amnezia_configuration">Global Amnezia configuration</string>
     <string name="security">Security</string>
     <string name="more_options">More options</string>
     <string name="status_template">status: %1$s</string>
@@ -459,4 +467,7 @@
     <string name="i4" translatable="false">I4</string>
     <string name="s1" translatable="false">S1</string>
     <string name="h4" translatable="false">H4</string>
+    <string name="getting_started_guidance">Use the + button to import a tunnel, or view the getting started guide.</string>
+    <string name="getting_started_guide_link">view the getting started guide</string>
+    <string name="no_tunnels_yet">Nothing here… yet.</string>
 </resources>

app/src/main/res/values-ka/strings.xml

@@ -44,6 +44,7 @@
     <string name="seconds">წამები</string>
     <string name="persistent_keepalive">მუდმივი keepalive</string>
     <string name="cancel">უარყოფა</string>
+    <string name="enabled_app_shortcuts">გააქტიურე აპლიკაციის მალსახმობები</string>
     <string name="unknown_error">დაფიქსირდა უცნობი შეცდომა</string>
     <string name="tunnel_on_wifi">ტუნელის გამოტენება Wi-Fi-ს მეშვეობით</string>
     <string name="email_subject">ვგ ტუნელის დახმარება</string>
@@ -60,6 +61,7 @@
     <string name="pin_created">პინი წარმატებით შეიქმნა</string>
     <string name="enter_pin">შეიყვანეთ პინი</string>
     <string name="create_pin">შექმენით პინი</string>
+    <string name="enable_app_lock">გააქტიურე აპლიკაციის დაბლოკვა</string>
     <string name="restart_at_boot">ჩართვისას დაწყება</string>
     <string name="vpn_denied_dialog_title">უფლება უარყოფილია</string>
     <string name="auto_tunnel_channel_id" translatable="false">Auto-tunnel Channel</string>
@@ -139,6 +141,7 @@
     <string name="remote_key">Remote key</string>
     <string name="mobile_data">Mobile data</string>
     <string name="use_shell_via_shizuku">Use shell via Shizuku to get Wi-Fi information, preventing the need for location permission on non-rooted devices</string>
+    <string name="stop_on_internet_loss">Stop tunnel on internet loss</string>
     <string name="vpn">VPN</string>
     <string name="tunnel_boot_description">Start the default tunnel on boot</string>
     <string name="allow_lan_traffic">Allow LAN traffic</string>
@@ -166,7 +169,7 @@
     <string name="auto_tunnel_channel_description">A channel for auto-tunnel state notifications</string>
     <string name="show_qr">Show QR</string>
     <string name="wifi_settings">Wi-Fi settings</string>
-    <string name="backup_success">Backup success</string>
+    <string name="backup_success">Backup success. %1$s</string>
     <string name="info">Info</string>
     <string name="backup_failed">Failed to create backup.</string>
     <string name="junk_packet_minimum_size">Junk packet minimum size</string>
@@ -215,6 +218,7 @@
     <string name="kofi">Ko-fi</string>
     <string name="donation_signoff">Gratefully,</string>
     <string name="selected">Selected</string>
+    <string name="global_split_tunneling">Global split tunneling</string>
     <string name="active_network">Active Network:</string>
     <string name="range_hint">(%1$d–%2$d)</string>
     <string name="delete_active_message">Cannot delete active tunnel.</string>
@@ -232,6 +236,7 @@
     <string name="kill_switch">kill switch</string>
     <string name="configuration">Configuration</string>
     <string name="drag_handle">Drag Handle</string>
+    <string name="global_dns_servers">Global DNS servers</string>
     <string name="display_theme">Display theme</string>
     <string name="contact">Contact</string>
     <string name="ports_must_differ">Failed. Proxies must have different ports.</string>
@@ -314,6 +319,7 @@
     <string name="tunnel_running_name_message">Name unchangeable while tunnel is active.</string>
     <string name="settings">Settings</string>
     <string name="export_failed">Export failed</string>
+    <string name="enable_remote_app_control">Enable remote app control</string>
     <string name="donation_closing">It\'s my dream to work for you on this project full-time.</string>
     <string name="update_download_failed">Update download failed.</string>
     <string name="network_name">Network:</string>
@@ -385,6 +391,7 @@
     <string name="dns_error_empty">Endpoint cannot be empty</string>
     <string name="tunnel_state_connected">Connected</string>
     <string name="dns_error_invalid_scheme">DoH must use HTTPS</string>
+    <string name="configuration_globals">Configuration globals</string>
     <string name="private_dns_hostname">Private DNS: hostname (%1$s)</string>
     <string name="app">App</string>
     <string name="refresh_rate">Statistics refresh rate</string>
@@ -426,6 +433,7 @@
     <string name="included_apps">%1$s apps included</string>
     <string name="error_http_port_unavailable">HTTP listener port %1$d is already in use.\nPlease choose a different port.</string>
     <string name="current_system_dns">Current system DNS</string>
+    <string name="global_amnezia_configuration">Global Amnezia configuration</string>
     <string name="security">Security</string>
     <string name="more_options">More options</string>
     <string name="status_template">status: %1$s</string>
@@ -459,4 +467,7 @@
     <string name="i4" translatable="false">I4</string>
     <string name="s1" translatable="false">S1</string>
     <string name="h4" translatable="false">H4</string>
+    <string name="getting_started_guidance">Use the + button to import a tunnel, or view the getting started guide.</string>
+    <string name="getting_started_guide_link">view the getting started guide</string>
+    <string name="no_tunnels_yet">Nothing here… yet.</string>
 </resources>

app/src/main/res/values-ko/strings.xml

@@ -15,6 +15,7 @@
     <string name="delete_tunnel">터널 삭제</string>
     <string name="tunnel_mobile_data">모바일 데이터에서 터널 사용</string>
     <string name="logs">로그</string>
+    <string name="enable_app_lock">앱 잠금 켜기</string>
     <string name="config_changes_saved">변경한 설정이 저장되었습니다.</string>
     <string name="join_telegram">Telegram 커뮤니티 참여</string>
     <string name="pin_created">Pin 생성 성공</string>
@@ -26,6 +27,7 @@
     <string name="remote_key">원격 키</string>
     <string name="mobile_data">모바일 데이터</string>
     <string name="use_shell_via_shizuku">Shizuku 셸을 이용하여, 루팅하지 않은 기기에서 위치 권한을 요구하지 않고 Wi-Fi 정보를 얻습니다</string>
+    <string name="stop_on_internet_loss">인터넷이 끊겼을 때 터널 중지</string>
     <string name="vpn">VPN</string>
     <string name="tunnel_boot_description">부팅 시 기본 터널 시작</string>
     <string name="allow_lan_traffic">LAN 트래픽 허용</string>
@@ -58,7 +60,7 @@
     <string name="wifi_settings">Wi-Fi 설정</string>
     <string name="tunnel_on_wifi">Wi-Fi에서 터널 사용</string>
     <string name="add_peer">피어 추가</string>
-    <string name="backup_success">백업 성공</string>
+    <string name="backup_success">백업 성공. %1$s</string>
     <string name="persistent_keepalive">지속적 연결 유지</string>
     <string name="info">정보</string>
     <string name="exclude">제외</string>
@@ -132,6 +134,7 @@
     <string name="kofi">Ko-fi</string>
     <string name="donation_signoff">감사를 담아,</string>
     <string name="selected">선택함</string>
+    <string name="global_split_tunneling">글로벌 분할 터널링</string>
     <string name="active_network">활성 네트워크:</string>
     <string name="range_hint">(%1$d–%2$d)</string>
     <string name="delete_active_message">활성화된 터널은 삭제할 수 없습니다.</string>
@@ -154,6 +157,7 @@
     <string name="mtu">MTU</string>
     <string name="configuration">설정</string>
     <string name="drag_handle">핸들 드래그</string>
+    <string name="global_dns_servers">글로벌 DNS 서버</string>
     <string name="display_theme">표시 테마</string>
     <string name="contact">연락</string>
     <string name="ports_must_differ">실패. 프록시는 다른 포트를 이용해야 합니다.</string>
@@ -255,6 +259,7 @@
     <string name="unavailable_in_mode">현재 모드에서는 이용 불가</string>
     <string name="server_port">서버:포트</string>
     <string name="camera_permission_required">카메라 권한 필요</string>
+    <string name="enabled_app_shortcuts">앱 바로가기 켜기</string>
     <string name="preferred_tunnel">선호 터널</string>
     <string name="allow">허용</string>
     <string name="underload_packet_magic_header">언더로드 패킷 매직 헤더</string>
@@ -269,6 +274,7 @@
     <string name="settings">설정</string>
     <string name="incorrect_pin">Pin이 잘못되었습니다</string>
     <string name="export_failed">내보내기 실패</string>
+    <string name="enable_remote_app_control">원격 앱 제어 켜기</string>
     <string name="donation_closing">프로젝트에 모든 시간을 할애하는 것이 제 꿈입니다.</string>
     <string name="update_download_failed">업데이트 다운로드에 실패했습니다.</string>
     <string name="network_name">네트워크:</string>
@@ -385,6 +391,7 @@
     <string name="dns_error_empty">Endpoint cannot be empty</string>
     <string name="tunnel_state_connected">Connected</string>
     <string name="dns_error_invalid_scheme">DoH must use HTTPS</string>
+    <string name="configuration_globals">Configuration globals</string>
     <string name="private_dns_hostname">Private DNS: hostname (%1$s)</string>
     <string name="app">App</string>
     <string name="refresh_rate">Statistics refresh rate</string>
@@ -426,6 +433,7 @@
     <string name="included_apps">%1$s apps included</string>
     <string name="error_http_port_unavailable">HTTP listener port %1$d is already in use.\nPlease choose a different port.</string>
     <string name="current_system_dns">Current system DNS</string>
+    <string name="global_amnezia_configuration">Global Amnezia configuration</string>
     <string name="security">Security</string>
     <string name="more_options">More options</string>
     <string name="status_template">status: %1$s</string>
@@ -459,4 +467,7 @@
     <string name="i4" translatable="false">I4</string>
     <string name="s1" translatable="false">S1</string>
     <string name="h4" translatable="false">H4</string>
+    <string name="getting_started_guidance">Use the + button to import a tunnel, or view the getting started guide.</string>
+    <string name="getting_started_guide_link">view the getting started guide</string>
+    <string name="no_tunnels_yet">Nothing here… yet.</string>
 </resources>

app/src/main/res/values-nb-rNO/strings.xml

@@ -17,6 +17,7 @@
     <string name="delete_tunnel">Delete tunnel</string>
     <string name="tunnel_mobile_data">Tunnel on mobile data</string>
     <string name="logs">Logs</string>
+    <string name="enable_app_lock">Enable app lock</string>
     <string name="config_changes_saved">Configuration changes saved.</string>
     <string name="join_telegram">Join Telegram community</string>
     <string name="pin_created">Pin successfully created</string>
@@ -28,6 +29,7 @@
     <string name="remote_key">Remote key</string>
     <string name="mobile_data">Mobile data</string>
     <string name="use_shell_via_shizuku">Use shell via Shizuku to get Wi-Fi information, preventing the need for location permission on non-rooted devices</string>
+    <string name="stop_on_internet_loss">Stop tunnel on internet loss</string>
     <string name="vpn">VPN</string>
     <string name="tunnel_boot_description">Start the default tunnel on boot</string>
     <string name="allow_lan_traffic">Allow LAN traffic</string>
@@ -60,7 +62,7 @@
     <string name="wifi_settings">Wi-Fi settings</string>
     <string name="tunnel_on_wifi">Tunnel on Wi-Fi</string>
     <string name="add_peer">Add peer</string>
-    <string name="backup_success">Backup success</string>
+    <string name="backup_success">Backup success. %1$s</string>
     <string name="persistent_keepalive">Persistent keepalive</string>
     <string name="info">Info</string>
     <string name="exclude">Exclude</string>
@@ -133,6 +135,7 @@
     <string name="kofi">Ko-fi</string>
     <string name="donation_signoff">Gratefully,</string>
     <string name="selected">Selected</string>
+    <string name="global_split_tunneling">Global split tunneling</string>
     <string name="active_network">Active Network:</string>
     <string name="range_hint">(%1$d–%2$d)</string>
     <string name="delete_active_message">Cannot delete active tunnel.</string>
@@ -155,6 +158,7 @@
     <string name="mtu">MTU</string>
     <string name="configuration">Configuration</string>
     <string name="drag_handle">Drag Handle</string>
+    <string name="global_dns_servers">Global DNS servers</string>
     <string name="display_theme">Display theme</string>
     <string name="contact">Contact</string>
     <string name="ports_must_differ">Failed. Proxies must have different ports.</string>
@@ -254,6 +258,7 @@
     <string name="unavailable_in_mode">Unavailable in current mode</string>
     <string name="server_port">Server:Port</string>
     <string name="camera_permission_required">Camera permission required</string>
+    <string name="enabled_app_shortcuts">Enable app shortcuts</string>
     <string name="preferred_tunnel">Preferred tunnel</string>
     <string name="allow">Allow</string>
     <string name="underload_packet_magic_header">Underload packet magic header</string>
@@ -268,6 +273,7 @@
     <string name="settings">Settings</string>
     <string name="incorrect_pin">Pin is incorrect</string>
     <string name="export_failed">Export failed</string>
+    <string name="enable_remote_app_control">Enable remote app control</string>
     <string name="donation_closing">It\'s my dream to work for you on this project full-time.</string>
     <string name="update_download_failed">Update download failed.</string>
     <string name="network_name">Network:</string>
@@ -385,6 +391,7 @@
     <string name="dns_error_empty">Endpoint cannot be empty</string>
     <string name="tunnel_state_connected">Connected</string>
     <string name="dns_error_invalid_scheme">DoH must use HTTPS</string>
+    <string name="configuration_globals">Configuration globals</string>
     <string name="private_dns_hostname">Private DNS: hostname (%1$s)</string>
     <string name="app">App</string>
     <string name="refresh_rate">Statistics refresh rate</string>
@@ -426,6 +433,7 @@
     <string name="included_apps">%1$s apps included</string>
     <string name="error_http_port_unavailable">HTTP listener port %1$d is already in use.\nPlease choose a different port.</string>
     <string name="current_system_dns">Current system DNS</string>
+    <string name="global_amnezia_configuration">Global Amnezia configuration</string>
     <string name="security">Security</string>
     <string name="more_options">More options</string>
     <string name="status_template">status: %1$s</string>
@@ -459,4 +467,7 @@
     <string name="i4" translatable="false">I4</string>
     <string name="s1" translatable="false">S1</string>
     <string name="h4" translatable="false">H4</string>
+    <string name="getting_started_guidance">Use the + button to import a tunnel, or view the getting started guide.</string>
+    <string name="getting_started_guide_link">view the getting started guide</string>
+    <string name="no_tunnels_yet">Nothing here… yet.</string>
 </resources>

app/src/main/res/values-nl/strings.xml

@@ -17,6 +17,7 @@
     <string name="name">Naam</string>
     <string name="seconds">Seconden</string>
     <string name="persistent_keepalive">Persistent keepalive</string>
+    <string name="enabled_app_shortcuts">App snelkoppelingen inschakelen</string>
     <string name="random">(willekeurig)</string>
     <string name="thank_you">Bedankt voor het gebruiken van WG Tunnel!</string>
     <string name="trusted_ssid_value_description">Verstuur SSID</string>
@@ -43,6 +44,7 @@
     <string name="auto_tunnel_title">Auto-tunnel service</string>
     <string name="open_issue">Open een melding</string>
     <string name="create_pin">Maak PIN</string>
+    <string name="enable_app_lock">Schakel app-lock in</string>
     <string name="init_packet_junk_size">Initiële junk packet grootte</string>
     <string name="junk_packet_maximum_size">Junk packet maximum grootte</string>
     <string name="response_packet_junk_size">Response junk packet grootte</string>
@@ -108,6 +110,7 @@
     <string name="enable_amnezia_compatibility">Amnezia compatibiliteit inschakelen</string>
     <string name="add_from_url">Toevoegen met link</string>
     <string name="stop_on_no_internet">Stoppen wanneer geen internet</string>
+    <string name="stop_on_internet_loss">Stop tunnel bij verlies van internet</string>
     <string name="wildcards_active">Wildcards actief</string>
     <string name="use_root_shell_for_wifi">Gebruik root shell om wifi naam te bepalen, zodat locatie toestemmingen niet nodig zijn</string>
     <string name="start_auto">Start auto-tunnel</string>
@@ -151,6 +154,7 @@
     <string name="auto_tunnel_not_running">Auto-tunnel is niet actief</string>
     <string name="auth_error">Niet toegelaten</string>
     <string name="service_running_error">Service niet actief</string>
+    <string name="enable_remote_app_control">Activeer applicatie controle vanop afstand</string>
     <string name="select_all">Selecteer alles</string>
     <string name="export_success">Export gelukt</string>
     <string name="download">Download</string>
@@ -222,7 +226,7 @@
     <string name="website">App website</string>
     <string name="mimic_quic">Mimic QUIC</string>
     <string name="wifi_settings">Wi-Fi instellingen</string>
-    <string name="backup_success">Backup succesvol</string>
+    <string name="backup_success">Backup succesvol. %1$s</string>
     <string name="info">Info</string>
     <string name="backup_failed">Backup maken mislukt.</string>
     <string name="unknown">Onbekend</string>
@@ -247,6 +251,7 @@
     <string name="kofi">Ko-fi</string>
     <string name="donation_signoff">Hartelijk bedankt,</string>
     <string name="selected">Geselecteerd</string>
+    <string name="global_split_tunneling">Globale split tunneling</string>
     <string name="active_network">Actief Netwerk:</string>
     <string name="range_hint">(%1$d–%2$d)</string>
     <string name="delete_active_message">Actieve tunnel kan niet worden verwijderd.</string>
@@ -257,6 +262,7 @@
     <string name="new_tunnel">Nieuwe tunnel</string>
     <string name="kill_switch">kill switch</string>
     <string name="configuration">Configuratie</string>
+    <string name="global_dns_servers">Globale DNS servers</string>
     <string name="contact">Contact</string>
     <string name="ports_must_differ">Mislukt. Proxyservers moeten verschillende poorten hebben.</string>
     <string name="backup_and_restore">Backup en herstellen</string>
@@ -385,6 +391,7 @@
     <string name="dns_error_empty">Endpoint cannot be empty</string>
     <string name="tunnel_state_connected">Connected</string>
     <string name="dns_error_invalid_scheme">DoH must use HTTPS</string>
+    <string name="configuration_globals">Configuration globals</string>
     <string name="private_dns_hostname">Private DNS: hostname (%1$s)</string>
     <string name="app">App</string>
     <string name="refresh_rate">Statistics refresh rate</string>
@@ -426,6 +433,7 @@
     <string name="included_apps">%1$s apps included</string>
     <string name="error_http_port_unavailable">HTTP listener port %1$d is already in use.\nPlease choose a different port.</string>
     <string name="current_system_dns">Current system DNS</string>
+    <string name="global_amnezia_configuration">Global Amnezia configuration</string>
     <string name="security">Security</string>
     <string name="more_options">More options</string>
     <string name="status_template">status: %1$s</string>
@@ -459,4 +467,7 @@
     <string name="i4" translatable="false">I4</string>
     <string name="s1" translatable="false">S1</string>
     <string name="h4" translatable="false">H4</string>
+    <string name="getting_started_guidance">Use the + button to import a tunnel, or view the getting started guide.</string>
+    <string name="getting_started_guide_link">view the getting started guide</string>
+    <string name="no_tunnels_yet">Nothing here… yet.</string>
 </resources>

app/src/main/res/values-nod/strings.xml

@@ -15,6 +15,7 @@
     <string name="delete_tunnel">Delete tunnel</string>
     <string name="tunnel_mobile_data">Tunnel on mobile data</string>
     <string name="logs">Logs</string>
+    <string name="enable_app_lock">Enable app lock</string>
     <string name="config_changes_saved">Configuration changes saved.</string>
     <string name="join_telegram">Join Telegram community</string>
     <string name="pin_created">Pin successfully created</string>
@@ -26,6 +27,7 @@
     <string name="remote_key">Remote key</string>
     <string name="mobile_data">Mobile data</string>
     <string name="use_shell_via_shizuku">Use shell via Shizuku to get Wi-Fi information, preventing the need for location permission on non-rooted devices</string>
+    <string name="stop_on_internet_loss">Stop tunnel on internet loss</string>
     <string name="vpn">VPN</string>
     <string name="tunnel_boot_description">Start the default tunnel on boot</string>
     <string name="allow_lan_traffic">Allow LAN traffic</string>
@@ -58,7 +60,7 @@
     <string name="wifi_settings">Wi-Fi settings</string>
     <string name="tunnel_on_wifi">Tunnel on Wi-Fi</string>
     <string name="add_peer">Add peer</string>
-    <string name="backup_success">Backup success</string>
+    <string name="backup_success">Backup success. %1$s</string>
     <string name="persistent_keepalive">Persistent keepalive</string>
     <string name="info">Info</string>
     <string name="exclude">Exclude</string>
@@ -132,6 +134,7 @@
     <string name="kofi">Ko-fi</string>
     <string name="donation_signoff">Gratefully,</string>
     <string name="selected">Selected</string>
+    <string name="global_split_tunneling">Global split tunneling</string>
     <string name="active_network">Active Network:</string>
     <string name="range_hint">(%1$d–%2$d)</string>
     <string name="delete_active_message">Cannot delete active tunnel.</string>
@@ -154,6 +157,7 @@
     <string name="mtu">MTU</string>
     <string name="configuration">Configuration</string>
     <string name="drag_handle">Drag Handle</string>
+    <string name="global_dns_servers">Global DNS servers</string>
     <string name="display_theme">Display theme</string>
     <string name="contact">Contact</string>
     <string name="ports_must_differ">Failed. Proxies must have different ports.</string>
@@ -255,6 +259,7 @@
     <string name="unavailable_in_mode">Unavailable in current mode</string>
     <string name="server_port">Server:Port</string>
     <string name="camera_permission_required">Camera permission required</string>
+    <string name="enabled_app_shortcuts">Enable app shortcuts</string>
     <string name="preferred_tunnel">Preferred tunnel</string>
     <string name="allow">Allow</string>
     <string name="underload_packet_magic_header">Underload packet magic header</string>
@@ -269,6 +274,7 @@
     <string name="settings">Settings</string>
     <string name="incorrect_pin">Pin is incorrect</string>
     <string name="export_failed">Export failed</string>
+    <string name="enable_remote_app_control">Enable remote app control</string>
     <string name="donation_closing">It\'s my dream to work for you on this project full-time.</string>
     <string name="update_download_failed">Update download failed.</string>
     <string name="network_name">Network:</string>
@@ -384,6 +390,7 @@
     <string name="dns_error_empty">Endpoint cannot be empty</string>
     <string name="tunnel_state_connected">Connected</string>
     <string name="dns_error_invalid_scheme">DoH must use HTTPS</string>
+    <string name="configuration_globals">Configuration globals</string>
     <string name="private_dns_hostname">Private DNS: hostname (%1$s)</string>
     <string name="app">App</string>
     <string name="refresh_rate">Statistics refresh rate</string>
@@ -425,6 +432,7 @@
     <string name="included_apps">%1$s apps included</string>
     <string name="error_http_port_unavailable">HTTP listener port %1$d is already in use.\nPlease choose a different port.</string>
     <string name="current_system_dns">Current system DNS</string>
+    <string name="global_amnezia_configuration">Global Amnezia configuration</string>
     <string name="security">Security</string>
     <string name="more_options">More options</string>
     <string name="status_template">status: %1$s</string>
@@ -458,4 +466,7 @@
     <string name="i4" translatable="false">I4</string>
     <string name="s1" translatable="false">S1</string>
     <string name="h4" translatable="false">H4</string>
+    <string name="getting_started_guidance">Use the + button to import a tunnel, or view the getting started guide.</string>
+    <string name="getting_started_guide_link">view the getting started guide</string>
+    <string name="no_tunnels_yet">Nothing here… yet.</string>
 </resources>

app/src/main/res/values-pl/strings.xml

@@ -11,11 +11,13 @@
     <string name="vpn_on">Włącz VPN</string>
     <string name="vpn_off">Wyłącz VPN</string>
     <string name="interface_">Interfejs</string>
+    <string name="enabled_app_shortcuts">Włącz skróty aplikacji</string>
     <string name="privacy_policy">Polityka prywatności</string>
     <string name="tunnel_mobile_data">Tunel przez mobilną transmisję danych</string>
     <string name="random">(losowy)</string>
     <string name="pin_created">Kod PIN został pomyślnie utworzony</string>
     <string name="enter_pin">Podaj kod PIN</string>
+    <string name="enable_app_lock">Włącz blokadę aplikacji</string>
     <string name="response_packet_junk_size">Rozmiar śmieciowego pakietu odpowiedzi</string>
     <string name="response_packet_magic_header">Nagłówek magicznego pakietu odpowiedzi</string>
     <string name="transport_packet_magic_header">Nagłówek magicznego pakietu transportowego</string>
@@ -55,7 +57,7 @@
     <string name="wildcards_active">Symbole wieloznaczne aktywne</string>
     <string name="create_pin">Utwórz kod PIN</string>
     <string name="junk_packet_maximum_size">Maksymalny rozmiar pakietu śmieciowego</string>
-    <string name="local_logging">Monitor lokalnych dzienników</string>
+    <string name="local_logging">Lokalne rejestrowanie</string>
     <string name="monitoring_state_changes">Monitorowanie zmian stanu</string>
     <string name="add_tunnels_text">Dodaj z pliku lub archiwum ZIP</string>
     <string name="unknown_error">Wystąpił nieznany błąd</string>
@@ -112,10 +114,11 @@
     <string name="set_primary_tunnel">Tunel używany, gdy nie skonfigurowano preferowanego tunelu</string>
     <string name="vpn_channel_id" translatable="false">VPN Channel</string>
     <string name="stop_on_no_internet">Zatrzymaj, gdy nie ma Internetu</string>
+    <string name="stop_on_internet_loss">Zatrzymaj tunel przy utracie Internetu</string>
     <string name="allow_lan_traffic">Zezwól na ruch LAN</string>
     <string name="bypass_lan_for_kill_switch">Omiń LAN dla wyłącznika awaryjnego</string>
-    <string name="vpn_channel_description">Kanał powiadomień o stanie VPN</string>
-    <string name="auto_tunnel_channel_description">Kanał powiadomień o stanie autotunelowania</string>
+    <string name="vpn_channel_description">Powiadomienia dotyczące tuneli VPN.</string>
+    <string name="auto_tunnel_channel_description">Powiadomienia o zdarzeniach autotunelowania.</string>
     <string name="stop">Zatrzymaj</string>
     <string name="splt_tunneling">Tunelowanie dzielone</string>
     <string name="pre_up">Przed aktywacją</string>
@@ -140,7 +143,7 @@
     <string name="join_telegram">Dołącz do społeczności Telegramu</string>
     <string name="error_download_failed">Nie udało się pobrać konfiguracji</string>
     <string name="service_running_error">Usługa nie działa</string>
-    <string name="app_permission_title">Mostek sterujący WG Tunnel</string>
+    <string name="app_permission_title">Sterowanie tunelem i funkcje autotunelowania.</string>
     <string name="enter_config_url">Wpisz adres URL konfiguracji</string>
     <string name="save">Zapisz</string>
     <string name="search">Szukaj</string>
@@ -153,6 +156,7 @@
     <string name="config_error">Nieprawidłowa konfiguracja</string>
     <string name="dropdown">Rozwijane</string>
     <string name="auth_error">Brak autoryzacji</string>
+    <string name="enable_remote_app_control">Włącz zdalne sterowanie aplikacją</string>
     <string name="add_tunnel">Dodaj tunel</string>
     <string name="select">Wybierz</string>
     <string name="dns_resolve_error">Rozwiązywanie DNS się nie powiodło</string>
@@ -203,7 +207,7 @@
     <string name="auto_tunnel_running">Autotunel jest uruchomiony</string>
     <string name="auto_tunnel_not_running">Autotunel nie jest uruchomiony</string>
     <string name="tunnel_monitoring">Monitorowanie tunelu</string>
-    <string name="backup_success">Powodzenie tworzenia kopii zapasowej</string>
+    <string name="backup_success">Powodzenie tworzenia kopii zapasowej. %1$s</string>
     <string name="restore_success">Powodzenie przywracania. %1$s</string>
     <string name="restarting_app">Ponowne uruchomienie aplikacji w celu zastosowania zmian…</string>
     <string name="restore_failed">Nie udało się przywrócić danych z kopii zapasowej.</string>
@@ -238,14 +242,14 @@
     <string name="read_failed">Nie udało się odczytać danych.</string>
     <string name="config_error_template">Błędna konfiguracja. %1$s w lokalizacji: %2$s.</string>
     <string name="ports_must_differ">Nie udało się. Serwery proxy muszą mieć różne porty.</string>
-    <string name="password_no_spaces">Hasło nie może zawierać spacji.</string>
-    <string name="tunnel_name_taken">Nazwa tunelu jest już używana.</string>
+    <string name="password_no_spaces">Hasło nie może zawierać spacji</string>
+    <string name="tunnel_name_taken">Nazwa tunelu jest już używana</string>
     <string name="range_hint">(%1$d–%2$d)</string>
     <string name="mimic_quic">Imituj QUIC</string>
     <string name="mimic_dns">Imituj DNS</string>
     <string name="mimic_sip">Imituj SIP</string>
-    <string name="ddns_auto_update">Automatyczna aktualizacja dynamicznego DNS</string>
-    <string name="ddns_auto_update_description">Automatyczna aktualizacja adresu IP po zmianach DDNS</string>
+    <string name="ddns_auto_update">Dynamiczny DNS (DDNS)</string>
+    <string name="ddns_auto_update_description">Ponownie rozwiązuje nazwę hosta serwera i aktualizuje punkty końcowe równorzędne po zmianach DDNS</string>
     <string name="mode_disabled_template">Funkcja niedostępna w trybie %1$s.</string>
     <string name="lockdown">Zablokowane</string>
     <string name="active_tunnel_update_failed">Aktualizacja aktywnego tunelu się nie powiodła</string>
@@ -298,6 +302,8 @@
     <string name="metered_tunnel">Tunel taryfowy</string>
     <string name="lockdown_settings">Ustawienia blokady</string>
     <string name="unavailable_in_mode">Niedostępne w obecnym trybie</string>
+    <string name="global_split_tunneling">Globalne tunelowanie dzielone</string>
+    <string name="global_dns_servers">Globalne serwery DNS</string>
     <string name="dual_stack">Sieć dual-stack</string>
     <string name="dual_stack_description">Tunele muszą obsługiwać protokoły IPv4 i IPv6</string>
     <string name="save_changes">Zapisz zmiany</string>
@@ -352,91 +358,93 @@
     <string name="github_sponsors_url" translatable="false">https://github.com/sponsors/zaneschepke</string>
     <string name="transport_packet_junk_size">Rozmiar śmieciowego pakietu transportu</string>
     <string name="cookie_packet_junk_size">Rozmiar śmieciowego pakietu ciasteczka</string>
-    <string name="fallback_to_ipv4">Fallback to IPv4</string>
-    <string name="excluded_apps">%1$s apps excluded</string>
-    <string name="resolution_method">Resolution method</string>
-    <string name="notification_ipv6_recovery_message">%1$s recovered IPv6 connectivity</string>
-    <string name="tunnel_state_resolving_dns">Resolving DNS</string>
-    <string name="handshake_template">handshake: %1$s</string>
+    <string name="fallback_to_ipv4">Awaryjny powrót do IPv4</string>
+    <string name="excluded_apps">Wykluczone aplikacje: %1$s</string>
+    <string name="resolution_method">Metoda rozwiązania</string>
+    <string name="notification_ipv6_recovery_message">%1$s odzyskał łączność IPv6</string>
+    <string name="tunnel_state_resolving_dns">Rozwiązywanie DNS</string>
+    <string name="handshake_template">wymiana potwierdzeń: %1$s</string>
     <string name="peer_template">peer: %1$s</string>
-    <string name="errors">Errors</string>
-    <string name="no_system_dns_information">No system DNS information</string>
-    <string name="export_unsupported">Export is not supported on this device</string>
-    <string name="tunnel_globals">Tunnel globals</string>
-    <string name="sort_by_latency">Sort by latency</string>
-    <string name="ready">Ready</string>
-    <string name="no_system_dns_detected">No system DNS detected</string>
-    <string name="name_error_empty">Tunnel name cannot be empty</string>
-    <string name="notification_ipv4_fallback_message">%1$s switched to IPv4 connectivity</string>
+    <string name="errors">Błędy</string>
+    <string name="no_system_dns_information">Brak informacji o systemie DNS</string>
+    <string name="export_unsupported">Eksport nie jest obsługiwany na tym urządzeniu</string>
+    <string name="tunnel_globals">Globalne zmienne tunelu</string>
+    <string name="sort_by_latency">Sortuj według opóźnienia</string>
+    <string name="ready">Gotowy</string>
+    <string name="no_system_dns_detected">Nie wykryto systemu DNS</string>
+    <string name="name_error_empty">Nazwa tunelu nie może być pusta</string>
+    <string name="notification_ipv4_fallback_message">%1$s przełączył się na łączność IPv4</string>
     <string name="notification_tunnel_status_format">%1$s • %2$s</string>
-    <string name="dns_error_invalid_ip_or_host">Invalid IP address or hostname</string>
-    <string name="proxy_channel_description">Notifications for proxy tunnels.</string>
-    <string name="system_dns_servers">Servers: %1$s</string>
-    <string name="balanced">Balanced (3s)</string>
-    <string name="import_url_description">The URL must be secure and serve a .conf file.</string>
-    <string name="dns_error_invalid_port">Port must be between 1 and 65535</string>
-    <string name="view_configuration">View configuration</string>
-    <string name="dot">DNS over TLS (DoT)</string>
-    <string name="ipv6_recovery">IPv6 recovery</string>
-    <string name="screen_recording_protection">Screen recording protection</string>
-    <string name="dns_error_invalid_host">Host cannot be empty</string>
-    <string name="toggle_sensitive_data_visibility">Toggle sensitive data visibility</string>
-    <string name="ipv4_fallback">IPv4 fallback</string>
-    <string name="dns_error_empty">Endpoint cannot be empty</string>
-    <string name="tunnel_state_connected">Connected</string>
-    <string name="dns_error_invalid_scheme">DoH must use HTTPS</string>
-    <string name="private_dns_hostname">Private DNS: hostname (%1$s)</string>
-    <string name="app">App</string>
-    <string name="refresh_rate">Statistics refresh rate</string>
-    <string name="app_selection">App selection</string>
-    <string name="tunnel_state_handshake_failure">Handshake failure</string>
-    <string name="notification_dynamic_dns_message">%1$s updated after Dynamic DNS change</string>
-    <string name="tunnel_state_establishing_connection">Establishing connection</string>
-    <string name="prefer_ipv6">Prefer IPv6</string>
-    <string name="peer_endpoints">Peer endpoints</string>
-    <string name="dns_endpoint_hint">IP, hostname, or DoH URL</string>
-    <string name="restore_ipv6">Restore IPv6</string>
-    <string name="network">Network</string>
-    <string name="fallback_to_ipv4_desc">Switch to IPv4 if IPv6 fails, without restarting the tunnel.</string>
-    <string name="tunnel_state_disconnected">Disconnected</string>
-    <string name="live">Real-time (1s)</string>
-    <string name="uptime_template">uptime: %1$s</string>
-    <string name="events">Events</string>
-    <string name="peer_resolution">Peer Resolution</string>
-    <string name="restore_ipv6_desc">Switch back to IPv6 when an IPv6 network is detected.</string>
-    <string name="errors_channel_description">A channel for application and tunnel errors</string>
-    <string name="vpn_permission_required">VPN permission required</string>
-    <string name="app_channel_description">A channel for general application notifications, like version updates</string>
-    <string name="automation">Automation</string>
-    <string name="balance_saver">Battery Saver (10s)</string>
-    <string name="pinging_servers">Pinging servers…</string>
-    <string name="dynamic_dns_update">Dynamic DNS update</string>
-    <string name="statistics">Statistics</string>
-    <string name="events_channel_description">A channel for app events, like automation event</string>
-    <string name="private_dns_automatic">Private DNS: automatic</string>
-    <string name="tunnel_statistics">Live tunnel statistics</string>
-    <string name="ipv6_settings">IPv6 settings</string>
-    <string name="error">Error</string>
-    <string name="dns_error_invalid_url">Invalid URL format</string>
-    <string name="view_live_tunnel">View live tunnel</string>
-    <string name="mode">Mode</string>
-    <string name="tunnel_state_starting">Starting</string>
-    <string name="dns_endpoint_label">DNS server endpoint</string>
-    <string name="plain_dns">Plain DNS (port 53)</string>
-    <string name="included_apps">%1$s apps included</string>
-    <string name="error_http_port_unavailable">HTTP listener port %1$d is already in use.\nPlease choose a different port.</string>
-    <string name="current_system_dns">Current system DNS</string>
-    <string name="security">Security</string>
-    <string name="more_options">More options</string>
-    <string name="status_template">status: %1$s</string>
-    <string name="export_canceled">Export canceled</string>
-    <string name="prefer_ipv6_desc">Use IPv6 endpoints when the network supports it.</string>
-    <string name="stop_all">Stop all</string>
-    <string name="copy_from">Copy from</string>
-    <string name="special_junk_packet">Special junk packet</string>
-    <string name="error_socks5_port_unavailable">SOCKS5 port %1$d is already in use.\nPlease choose a different port.</string>
-    <string name="tunnel_scripting">Pre/Post script support</string>
-    <string name="initializing">Initializing…</string>
+    <string name="dns_error_invalid_ip_or_host">Nieprawidłowy adres IP lub nazwa hosta</string>
+    <string name="proxy_channel_description">Powiadomienia dotyczące tuneli proxy.</string>
+    <string name="system_dns_servers">Serwery: %1$s</string>
+    <string name="balanced">Zrównoważona (3 s)</string>
+    <string name="import_url_description">Adres URL musi być bezpieczny i obsługiwać plik .conf.</string>
+    <string name="dns_error_invalid_port">Port musi być pomiędzy 1 a 65535</string>
+    <string name="view_configuration">Wyświetl konfigurację</string>
+    <string name="dot">DNS poprzez TLS (DoT)</string>
+    <string name="ipv6_recovery">Odzyskiwanie IPv6</string>
+    <string name="screen_recording_protection">Ochrona przed nagrywaniem ekranu</string>
+    <string name="dns_error_invalid_host">Host nie może być pusty</string>
+    <string name="toggle_sensitive_data_visibility">Przełącz widoczność poufnych danych</string>
+    <string name="ipv4_fallback">Zapasowy IPv4</string>
+    <string name="dns_error_empty">Punkt końcowy nie może być pusty</string>
+    <string name="tunnel_state_connected">Połączono</string>
+    <string name="dns_error_invalid_scheme">DoH musi używać HTTPS</string>
+    <string name="configuration_globals">Globalne zmienne konfiguracji</string>
+    <string name="private_dns_hostname">Prywatny DNS: nazwa hosta (%1$s)</string>
+    <string name="app">Aplikacja</string>
+    <string name="refresh_rate">Częstotliwość odświeżania statystyki</string>
+    <string name="app_selection">Wybór aplikacji</string>
+    <string name="tunnel_state_handshake_failure">Niepowodzenie wymiany potwierdzeń</string>
+    <string name="notification_dynamic_dns_message">%1$s zaktualizowany po zmianie dynamicznego DNS</string>
+    <string name="tunnel_state_establishing_connection">Nawiązywanie połączenia</string>
+    <string name="prefer_ipv6">Preferuj IPv6</string>
+    <string name="peer_endpoints">Punkty końcowe peerów</string>
+    <string name="dns_endpoint_hint">Adres IP, nazwa hosta lub adres URL DoH</string>
+    <string name="restore_ipv6">Przywróć IPv6</string>
+    <string name="network">Sieć</string>
+    <string name="fallback_to_ipv4_desc">W przypadku awarii protokołu IPv6 przełącz się na protokół IPv4 bez ponownego uruchamiania tunelu.</string>
+    <string name="tunnel_state_disconnected">Rozłączono</string>
+    <string name="live">Czasu rzeczywistego (1 s)</string>
+    <string name="uptime_template">czas pracy: %1$s</string>
+    <string name="events">Zdarzenia</string>
+    <string name="peer_resolution">Rozwiązanie peerów</string>
+    <string name="restore_ipv6_desc">Po wykryciu sieci IPv6 przełącz się z powrotem na IPv6.</string>
+    <string name="errors_channel_description">Kanał dla błędów aplikacji i tuneli</string>
+    <string name="vpn_permission_required">Wymagane zezwolenie VPN</string>
+    <string name="app_channel_description">Kanał powiadomień ogólnych aplikacji, takich jak aktualizacje wersji</string>
+    <string name="automation">Automatyzacja</string>
+    <string name="balance_saver">Oszczędzanie baterii (10 s)</string>
+    <string name="pinging_servers">Pingowanie serwerów…</string>
+    <string name="dynamic_dns_update">Aktualizacja dynamicznego DNS</string>
+    <string name="statistics">Statystyka</string>
+    <string name="events_channel_description">Kanał dla zdarzeń aplikacji, takich jak zdarzenia automatyzacji</string>
+    <string name="private_dns_automatic">Prywatny DNS: automatyczny</string>
+    <string name="tunnel_statistics">Statystyka aktywnego tunelu</string>
+    <string name="ipv6_settings">Ustawienia IPv6</string>
+    <string name="error">Błąd</string>
+    <string name="dns_error_invalid_url">Nieprawidłowy format adresu URL</string>
+    <string name="view_live_tunnel">Wyświetl aktywny tunel</string>
+    <string name="mode">Tryb</string>
+    <string name="tunnel_state_starting">Uruchamianie</string>
+    <string name="dns_endpoint_label">Punkt końcowy serwera DNS</string>
+    <string name="plain_dns">Zwykły DNS (port 53)</string>
+    <string name="included_apps">Uwzględnione aplikacje: %1$s</string>
+    <string name="error_http_port_unavailable">Port nasłuchiwania HTTP %1$d jest już używany.\nWybierz inny port.</string>
+    <string name="current_system_dns">Bieżący system DNS</string>
+    <string name="global_amnezia_configuration">Globalna konfiguracja Amnezia</string>
+    <string name="security">Bezpieczeństwo</string>
+    <string name="more_options">Więcej opcji</string>
+    <string name="status_template">stan: %1$s</string>
+    <string name="export_canceled">Eksport anulowano</string>
+    <string name="prefer_ipv6_desc">Używaj punktów końcowych IPv6, jeśli sieć to obsługuje.</string>
+    <string name="stop_all">Zatrzymaj wszystko</string>
+    <string name="copy_from">Skopiuj z</string>
+    <string name="special_junk_packet">Specjalny pakiet śmieciowy</string>
+    <string name="error_socks5_port_unavailable">Port SOCKS5 %1$d jest już zajęty.\nWybierz inny port.</string>
+    <string name="tunnel_scripting">Obsługa skryptu przed/po</string>
+    <string name="initializing">Inicjalizacja…</string>
     <string name="errors_channel_id" translatable="false">Errors Channel</string>
     <string name="s2" translatable="false">S2</string>
     <string name="jc" translatable="false">Jc</string>
@@ -459,4 +467,7 @@
     <string name="i4" translatable="false">I4</string>
     <string name="s1" translatable="false">S1</string>
     <string name="h4" translatable="false">H4</string>
+    <string name="getting_started_guidance">Use the + button to import a tunnel, or view the getting started guide.</string>
+    <string name="getting_started_guide_link">view the getting started guide</string>
+    <string name="no_tunnels_yet">Nothing here… yet.</string>
 </resources>