chore: release 5.0.4

Improve notification efficiency
#1288

.github/workflows/build-aab.yml

@@ -70,16 +70,16 @@ jobs:
     outputs:
       UPLOAD_DIR_ANDROID: ${{ env.UPLOAD_DIR_ANDROID }}
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
         with:
           fetch-depth: 0
           submodules: recursive
 
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v5
         with:
           distribution: 'temurin'
-          java-version: '17'
+          java-version: '21'
           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@v6
+      - uses: actions/checkout@v7
         with:
           fetch-depth: 0
           submodules: recursive
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v5
         with:
           distribution: 'temurin'
-          java-version: '17'
+          java-version: '21'
           cache: gradle
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
@@ -112,6 +112,9 @@ 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@v6
+        uses: actions/checkout@v7
       - name: Check for new commits
         id: check
         env:
@@ -43,7 +43,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
 
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
         with:
           submodules: recursive
 

.github/workflows/pr.yml

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

.github/workflows/publish.yml

@@ -78,7 +78,7 @@ jobs:
     name: publish-github
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
         with:
           ref: ${{ github.event_name == 'push' && github.ref || 'master' }}
       - name: Install system dependencies
@@ -205,7 +205,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: build-google-aab
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
         with:
           ref: ${{ github.event_name == 'push' && github.ref || 'master' }}
 

README.md

@@ -49,7 +49,7 @@ 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 (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.
+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.
  
 </div>
 
@@ -67,21 +67,18 @@ WG Tunnel is an alternative Android client for WireGuard and AmneziaWG, inspired
 
 ## Features
 
-- **Tunnel Import Methods**: Easily add tunnels using .conf files, ZIP archives, manual entry, or QR code scanning.
+- **Auto-Tunneling:** Automatically activate tunnels based on your device's active network details.
-- **Auto-Tunneling**: Automatically activate tunnels based on Wi-Fi SSID, Ethernet connections, or mobile data networks.
+- **Deferred Endpoint Bootstrapping:** Safely resolves endpoints and updates peers after the tunnel is up for better reliability and leak protection on startup.
-- **Split Tunneling**: Flexible support for routing specific apps or traffic through the VPN.
+- **Handshake Monitoring:** Real-time handshake monitoring for instant tunnel health feedback.
-- **WireGuard Modes**: Full compatibility with WireGuard in both kernel and userspace implementations.
+- **AmneziaWG Support:** Full support for AmneziaWG 2.0, providing robust censorship protection.
-- **AmneziaWG Integration**: Userspace mode for AmneziaWG, providing robust censorship evasion.
+- **Split Tunneling:** Flexible support for routing specific apps or traffic through the VPN.
-- **Always-On VPN**: Ensures continuous protection with Android's Always-On VPN feature.
+- **Local Proxy Mode:** Expose WireGuard tunnels over a local SOCKS5 or HTTP proxy to browsers or firewall apps (like AdGuard).
-- **Quick Controls**: Quick Settings tile and home screen shortcuts for easy VPN toggling.
+- **Lockdown Mode:** Advanced in-app kill switch that blocks all traffic while the tunnel is down.
-- **Automation Support**: Intent-based automation for controlling tunnels.
+- **Quick Controls:** Quick Settings tile and home screen shortcuts for easy toggling.
-- **Auto-Restore**: Seamlessly restores auto-tunneling and active tunnels after device restarts or app updates.
+- **Remote Control Support:** Intent-based automation for controlling tunnels and auto-tunneling from automation apps (like Tasker).
-- **Proxying Options**: Built-in HTTP and SOCKS5 proxy support within tunnels.
+- **Dynamic DNS Handling:** Automatically detect and update endpoints on server IP changes without requiring a restart.
-- **Lockdown Mode**: Custom kill switch for maximum leak prevention and security.
+- **IPv6 Endpoints:** Automatically upgrade to IPv6 endpoints or fall back to IPv4 based on network conditions without requiring a restart.
-- **Dynamic DNS Handling**: Detects and updates DNS changes without tunnel restarts.
+- **Android TV Support:** Full support for nearly all features on Android TV.
-- **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,6 +1,5 @@
 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)
@@ -23,13 +22,6 @@ 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
@@ -46,10 +38,11 @@ configure<ApplicationExtension> {
 
     splits {
         abi {
-            isEnable = !project.hasProperty("noSplits")
+            val noSplits = providers.gradleProperty("noSplits").isPresent
+            isEnable = !noSplits
             reset()
             include("armeabi-v7a", "arm64-v8a")
-            isUniversalApk = !project.hasProperty("noSplits")
+            isUniversalApk = !noSplits
         }
     }
 
@@ -57,14 +50,17 @@ configure<ApplicationExtension> {
         applicationId = Constants.APP_ID
         minSdk = Constants.MIN_SDK
         targetSdk = Constants.TARGET_SDK
-        versionCode = computeVersionCode()
+        versionCode = Constants.VERSION_CODE
-        versionName = computeVersionName()
+        versionName = Constants.VERSION_NAME
+
+        experimentalProperties["android.experimental.disableGitVersion"] = true
 
         sourceSets {
             getByName("debug").assets.directories += "$projectDir/schemas"
         }
 
-        val languagesArray = buildLanguagesArray(languageList())
+        val languagesProvider = project.languageListProvider()
+        val languagesArray = buildLanguagesArray(languagesProvider.get())
         buildConfigField("String[]", "LANGUAGES", "new String[]{ $languagesArray }")
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
@@ -134,8 +130,6 @@ configure<ApplicationExtension> {
 
     compileOptions {
         isCoreLibraryDesugaringEnabled = true
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
     }
 
     buildFeatures {
@@ -148,31 +142,42 @@ configure<ApplicationExtension> {
 
 androidComponents {
     onVariants { variant ->
+        val isNightly = project.isNightlyBuild()
 
-        val abiNameMap =
+        if (isNightly) {
-            mapOf(
+            variant.outputs.forEach { output ->
-                "armeabi-v7a" to "armv7",
+
-                "arm64-v8a" to "arm64",
+                output.versionCode.set(
-                "x86" to "x86",
+                    output.versionCode.get() + project.getVersionCodeIncrement()
-                "x86_64" to "x64",
+                )
-            )
+
+                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",
+        )
 
         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 =
+            val outputFileName = if (!abi.isNullOrEmpty()) {
-                if (!abi.isNullOrEmpty()) {
+                val shortAbiName = abiNameMap.getOrDefault(abi, abi)
-                    val shortAbiName = abiNameMap.getOrDefault(abi, abi)
+                "${baseFileName}-${shortAbiName}.apk"
-                    "${baseFileName}-${shortAbiName}.apk"
+            } else {
-                } else {
+                "${baseFileName}.apk"
-                    "${baseFileName}.apk"
+            }
-                }
 
             output.outputFileName.set(outputFileName)
         }
@@ -225,6 +230,7 @@ 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=".core.service.tile.TunnelControlTile"
+            android:name=".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=".core.service.tile.AutoTunnelControlTile"
+            android:name=".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=".core.service.autotunnel.AutoTunnelService"
+            android:name=".service.autotunnel.AutoTunnelService"
             android:enabled="true"
             android:exported="false"
             android:foregroundServiceType="specialUse"

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

@@ -19,17 +19,34 @@ 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.layout.wrapContentHeight
+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.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
@@ -41,15 +58,12 @@ 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.LinkAnnotation
+import androidx.compose.ui.text.font.FontWeight
-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.text.style.TextDecoration
+import androidx.compose.ui.unit.IntOffset
-import androidx.compose.ui.text.withLink
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.zIndex
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
@@ -59,6 +73,10 @@ 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
@@ -70,10 +88,6 @@ 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
@@ -110,19 +124,28 @@ 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
@@ -132,6 +155,7 @@ 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() {
@@ -155,9 +179,9 @@ class MainActivity : AppCompatActivity() {
         }
         super.onCreate(savedInstanceState)
 
-        handleIncomingIntent(intent)
+        roomBackup = RoomBackup(this).database(appDatabase).enableLogDebug(true).maxFileCount(5)
 
-        roomBackup = RoomBackup(this)
+        handleIncomingIntent(intent)
 
         installSplashScreen().apply {
             setKeepOnScreenCondition { !viewModel.container.stateFlow.value.isAppLoaded }
@@ -175,7 +199,7 @@ class MainActivity : AppCompatActivity() {
                 }
             }
 
-            val snackbarState = rememberCustomSnackbarState()
+            val toaster = rememberToasterState()
             var showVpnPermissionDialog by remember { mutableStateOf(false) }
             var vpnPermissionDenied by remember { mutableStateOf(false) }
             var requestingTunnelMode by remember {
@@ -232,22 +256,18 @@ class MainActivity : AppCompatActivity() {
                         }
 
                         is GlobalSideEffect.Snackbar -> {
-                            scope.launch {
+                            when (sideEffect.type) {
-                                snackbarState.showSnackbar(
+                                ToastType.Warning,
-                                    SnackbarInfo(
+                                ToastType.Error -> toaster.dismissAll()
-                                        message =
+                                else -> Unit
-                                            buildAnnotatedString {
-                                                append(sideEffect.message.asString(context))
-                                            },
-                                        type = sideEffect.type ?: SnackbarType.INFO,
-                                        durationMs = sideEffect.durationMs ?: 4000L,
-                                    )
-                                )
                             }
-                        }
 
-                        is GlobalSideEffect.Toast ->
+                            toaster.show(
-                            scope.launch { context.showToast(sideEffect.message.asString(context)) }
+                                message = sideEffect.message.asString(context),
+                                type = sideEffect.type,
+                                duration = (sideEffect.durationMs ?: 4000L).milliseconds,
+                            )
+                        }
 
                         is GlobalSideEffect.LaunchUrl -> context.openWebUrl(sideEffect.url)
                         is GlobalSideEffect.InstallApk -> context.installApk(sideEffect.apk)
@@ -275,49 +295,26 @@ 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)
-                            snackbarState.showSnackbar(
+                            toaster.show(
-                                SnackbarInfo(
+                                message =
-                                    message = annotatedMessage,
+                                    context.getString(R.string.donation_prompt_prefix) +
-                                    type = SnackbarType.THANK_YOU,
+                                        " " +
-                                    durationMs = 30_000L,
+                                        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)
+                                        },
+                                    ),
                             )
                         }
                     }
@@ -378,25 +375,6 @@ 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) {
@@ -548,6 +526,70 @@ 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,
+                            )
                         }
                     }
                 }
@@ -555,51 +597,76 @@ class MainActivity : AppCompatActivity() {
         }
     }
 
-    fun performBackup() = lifecycleScope.launch {
+    fun performBackup(encrypt: Boolean = false, password: String? = null) {
         roomBackup
-            .database(appDatabase)
             .backupLocation(RoomBackup.BACKUP_FILE_LOCATION_CUSTOM_DIALOG)
-            .enableLogDebug(true)
-            .maxFileCount(5)
             .apply {
-                onCompleteListener { success, _, _ ->
+                if (encrypt && !password.isNullOrBlank()) {
-                    lifecycleScope.launch {
+                    backupIsEncrypted(true)
+                    customEncryptPassword(password)
+                }
+            }
+            .onCompleteListener { success, _, _ ->
+                lifecycleScope.launch {
+                    val sideEffect =
                         if (success) {
-                            showToast(
+                            GlobalSideEffect.Snackbar(
-                                getString(
+                                StringValue.StringResource(R.string.backup_success),
-                                    R.string.backup_success,
+                                ToastType.Success,
-                                    getString(R.string.restarting_app),
-                                )
                             )
-                            restartApp()
                         } else {
-                            showToast(R.string.backup_failed)
+                            GlobalSideEffect.Snackbar(
+                                StringValue.StringResource(R.string.backup_failed),
+                                ToastType.Error,
+                            )
                         }
-                    }
+                    viewModel.postSideEffect(sideEffect)
                 }
             }
             .backup()
     }
 
-    fun performRestore() = lifecycleScope.launch {
+    fun performRestore(encrypt: Boolean = false, password: String? = null) {
         roomBackup
-            .database(appDatabase)
-            .enableLogDebug(true)
             .backupLocation(RoomBackup.BACKUP_FILE_LOCATION_CUSTOM_DIALOG)
             .apply {
-                onCompleteListener { success, _, _ ->
+                if (encrypt && !password.isNullOrBlank()) {
-                    lifecycleScope.launch {
+                    backupIsEncrypted(true)
-                        if (success) {
+                    customEncryptPassword(password)
-                            showToast(
+                }
-                                getString(
+            }
-                                    R.string.restore_success,
+            .onCompleteListener { success, message, exitCode ->
-                                    getString(R.string.restarting_app),
+                lifecycleScope.launch {
-                                )
+                    if (success) {
+                        viewModel.postSideEffect(
+                            GlobalSideEffect.Snackbar(
+                                StringValue.StringResource(R.string.restore_success),
+                                ToastType.Success,
                             )
-                            restartApp()
+                        )
-                        } else {
+                        roomBackup.restartApp(Intent(this@MainActivity, MainActivity::class.java))
-                            showToast(R.string.restore_failed)
+                    } 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,
+                            )
+                        )
                     }
                 }
             }
@@ -619,13 +686,20 @@ 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
+                val uri: Uri? = intent.data ?: return
-                uri?.let { viewModel.importFromUri(it) }
+                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)
             }
         }
     }

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

@@ -6,11 +6,8 @@ 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
@@ -21,6 +18,9 @@ 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,11 +71,10 @@ class WireGuardAutoTunnel : Application(), KoinComponent {
             lazyModules(networkModule)
         }
         instance = this
+
         notificationService.createAllChannels()
 
-        // Sync tiles
+        syncTiles()
-        AutoTunnelTileRefresher.refresh(this)
-        TunnelTileRefresher.refresh(this)
 
         if (BuildConfig.DEBUG) {
             Timber.plant(Timber.DebugTree())
@@ -111,6 +110,11 @@ 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,14 +1,19 @@
 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.core.notification.TunnelNotificationLine
+import com.zaneschepke.wireguardautotunnel.domain.repository.GlobalEffectRepository
-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
@@ -20,11 +25,14 @@ 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)
@@ -36,54 +44,174 @@ class TunnelEventDispatcher(
         tunnelDisplayStates: StateFlow<Map<Int, DisplayTunnelState>>,
     ) {
 
-        // informational events
+        // Informational events from tunnel backend
         providerEvents
-            .distinctUntilChanged()
             .onEach { event ->
                 when (event) {
                     is TunnelEvent.FallbackToIpv4 -> {
                         val name = getTunnelName(event.tunnelId)
-                        notificationManager.showIpv4Fallback(name)
+                        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) },
+                        )
                     }
 
                     is TunnelEvent.RecoveredToIpv6 -> {
                         val name = getTunnelName(event.tunnelId)
-                        notificationManager.showIpv6Recovery(name)
+                        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) },
+                        )
                     }
 
                     is TunnelEvent.DynamicDnsUpdate -> {
                         val name = getTunnelName(event.tunnelId)
-                        notificationManager.showDynamicDnsUpdate(name)
+                        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) },
+                        )
                     }
 
                     is TunnelEvent.NoRootShellAccess -> {
-                        notificationManager.showRootShellAccess()
+                        showOrNotify(
+                            scope = scope,
+                            foregroundAction = {
+                                globalEffectRepository.post(
+                                    GlobalSideEffect.Snackbar(
+                                        message =
+                                            StringValue.DynamicString(
+                                                context.getString(R.string.error_root_denied)
+                                            ),
+                                        type = ToastType.Error,
+                                    )
+                                )
+                            },
+                            backgroundAction = { notificationManager.showRootShellAccess() },
+                        )
                     }
                 }
             }
             .launchIn(scope)
 
-        // errors from the coordinator
+        // Errors from our tunnel coordinator
         coordinatorErrors
-            .distinctUntilChanged()
             .onEach { error ->
                 when (error) {
                     is TunnelErrorEvent.VpnPermissionDenied -> {
-                        notificationManager.showVpnRequired()
+                        showOrNotify(
+                            scope = scope,
+                            foregroundAction = {
+                                globalEffectRepository.post(
+                                    GlobalSideEffect.Snackbar(
+                                        message =
+                                            StringValue.DynamicString(
+                                                context.getString(R.string.vpn_permission_required)
+                                            ),
+                                        type = ToastType.Error,
+                                    )
+                                )
+                            },
+                            backgroundAction = { notificationManager.showVpnRequired() },
+                        )
                     }
 
                     is TunnelErrorEvent.InternalFailure -> {
-                        notificationManager.showError(error.message)
+                        showOrNotify(
+                            scope = scope,
+                            foregroundAction = {
+                                globalEffectRepository.post(
+                                    GlobalSideEffect.Snackbar(
+                                        message = StringValue.DynamicString(error.message),
+                                        type = ToastType.Error,
+                                    )
+                                )
+                            },
+                            backgroundAction = { notificationManager.showError(error.message) },
+                        )
                     }
 
                     is TunnelErrorEvent.Socks5PortUnavailable -> {
                         val name = getTunnelName(error.tunnelId)
-                        notificationManager.showSocks5PortUnavailable(error.port, name)
+                        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)
+                            },
+                        )
                     }
 
                     is TunnelErrorEvent.HttpPortUnavailable -> {
                         val name = getTunnelName(error.tunnelId)
-                        notificationManager.showHttpPortUnavailable(error.port, name)
+                        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)
+                            },
+                        )
                     }
                 }
             }
@@ -106,8 +234,7 @@ class TunnelEventDispatcher(
                         val tunnel = allTunnels.find { it.id == id } ?: return@mapNotNull null
 
                         val displayState =
-                            displayStates[id]
+                            displayStates[id] ?: DisplayTunnelState.from(activeTunnel)
-                                ?: DisplayTunnelState.from(activeTunnel, System.currentTimeMillis())
 
                         TunnelNotificationLine(
                             id = id,
@@ -135,8 +262,7 @@ class TunnelEventDispatcher(
 
                         val tunnel = allTunnels.find { it.id == id } ?: return@mapNotNull null
                         val displayState =
-                            displayStates[id]
+                            displayStates[id] ?: DisplayTunnelState.from(activeTunnel)
-                                ?: DisplayTunnelState.from(activeTunnel, System.currentTimeMillis())
 
                         TunnelNotificationLine(
                             id = id,
@@ -154,6 +280,18 @@ class TunnelEventDispatcher(
             .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/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,7 +2,6 @@ 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
@@ -17,6 +16,7 @@ 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
@@ -55,7 +55,7 @@ class TunnelCoordinator(
         tunnelProvider.backendStatus
             .map { status ->
                 status.activeTunnels.mapValues { (_, activeTunnel) ->
-                    DisplayTunnelState.from(activeTunnel, System.currentTimeMillis())
+                    DisplayTunnelState.from(activeTunnel)
                 }
             }
             .debounce(400L.milliseconds)
@@ -206,6 +206,10 @@ 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/tunnel/AndroidApplicationProvider.kt

@@ -0,0 +1,116 @@
+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,25 +1,19 @@
 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.NotificationProvider
+import com.zaneschepke.tunnel.ApplicationProvider
-import com.zaneschepke.tunnel.backend.RootShell
+import com.zaneschepke.tunnel.util.RootShell
 import com.zaneschepke.tunnel.util.RootShellException
-import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.core.event.TunnelEventDispatcher
-import com.zaneschepke.wireguardautotunnel.core.notification.AndroidNotificationService.NotificationChannels
+import com.zaneschepke.wireguardautotunnel.core.tunnel.AndroidApplicationProvider
-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
@@ -36,40 +30,15 @@ import timber.log.Timber
 
 val tunnelBackendProviderModule = module {
     single<TunnelNotificationService> { AndroidTunnelNotificationService(get()) }
+    single { AppVisibilityObserver() }
     singleOf(::TunnelEventDispatcher)
 
-    single<NotificationProvider> {
+    single<ApplicationProvider> {
-        val notificationService = get<NotificationService>()
+        AndroidApplicationProvider(
-        val context = androidContext()
+            notificationService = get(),
-        object : NotificationProvider {
+            tunnelNotificationService = get(),
-            override val vpnInitNotification: Notification
+            tunnelRepository = get(),
-                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/repository/GlobalEffectRepository.kt

@@ -7,7 +7,7 @@ import kotlinx.coroutines.flow.asSharedFlow
 class GlobalEffectRepository {
 
     private val _globalEffectFlow =
-        MutableSharedFlow<GlobalSideEffect>(replay = 0, extraBufferCapacity = 1)
+        MutableSharedFlow<GlobalSideEffect>(replay = 0, extraBufferCapacity = 0)
     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,14 +10,12 @@ sealed class GlobalSideEffect {
 
     data class Snackbar(
         val message: StringValue,
-        val type: SnackbarType? = null,
+        val type: ToastType,
         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

@@ -0,0 +1,26 @@
+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/notification/AndroidNotificationService.kt

@@ -1,4 +1,4 @@
-package com.zaneschepke.wireguardautotunnel.core.notification
+package com.zaneschepke.wireguardautotunnel.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/notification/AndroidTunnelNotificationService.kt

@@ -1,21 +1,116 @@
-package com.zaneschepke.wireguardautotunnel.core.notification
+package com.zaneschepke.wireguardautotunnel.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,
@@ -88,26 +183,36 @@ class AndroidTunnelNotificationService(private val notificationService: Notifica
         notificationService.show(notificationId, notification)
     }
 
-    override fun updateProxyPersistentNotification(
-        tunnelNotificationLines: Map<Int, TunnelNotificationLine>
-    ) {
-        updateGroupNotification(
-            tunnelNotificationLines = tunnelNotificationLines,
-            notificationId = PROXY_NOTIFICATION_ID,
-            channel = NotificationChannels.Tunnel.Proxy,
-            groupKey = PROXY_GROUP_KEY,
-        )
-    }
-
     override fun updateVpnPersistentNotification(
         tunnelNotificationLines: Map<Int, TunnelNotificationLine>
     ) {
-        updateGroupNotification(
+        if (tunnelNotificationLines.isEmpty()) {
-            tunnelNotificationLines = tunnelNotificationLines,
+            notificationService.remove(VPN_NOTIFICATION_ID)
-            notificationId = VPN_NOTIFICATION_ID,
+            return
-            channel = NotificationChannels.Tunnel.VPN,
+        }
-            groupKey = VPN_GROUP_KEY,
+        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)
     }
 
     override fun showIpv4Fallback(tunnelName: String) {

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

@@ -1,10 +1,10 @@
-package com.zaneschepke.wireguardautotunnel.core.notification
+package com.zaneschepke.wireguardautotunnel.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/notification/TunnelNotificationLine.kt

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

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

@@ -1,4 +1,6 @@
-package com.zaneschepke.wireguardautotunnel.core.notification
+package com.zaneschepke.wireguardautotunnel.notification
+
+import android.app.Notification
 
 interface TunnelNotificationService {
 
@@ -6,6 +8,14 @@ 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/service/ServiceManager.kt

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

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

@@ -1,4 +1,4 @@
-package com.zaneschepke.wireguardautotunnel.core.service.autotunnel
+package com.zaneschepke.wireguardautotunnel.service.autotunnel
 
 import com.zaneschepke.wireguardautotunnel.domain.events.AutoTunnelEvent
 import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConfig

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

@@ -1,4 +1,4 @@
-package com.zaneschepke.wireguardautotunnel.core.service.autotunnel
+package com.zaneschepke.wireguardautotunnel.service.autotunnel
 
 import android.content.Intent
 import androidx.core.app.ServiceCompat
@@ -7,10 +7,7 @@ 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
@@ -23,17 +20,21 @@ 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.distinctUntilChangedBy
 import kotlinx.coroutines.flow.firstOrNull
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.mapNotNull
@@ -77,13 +78,16 @@ class AutoTunnelService : LifecycleService() {
     @Volatile private var hasUserOverride = false
     private var lastNetworkFingerprint: AutoTunnelState.NetworkFingerprint? = null
 
+    @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.distinctUntilChangedBy { it.activeTunnels.keys.toSet() }
+            tunnelCoordinator.backendStatus
+                .distinctUntilChanged { old, new -> old.activeTunnels == new.activeTunnels }
+                .debounce(300L.milliseconds)
 
         combine(networkFlow, settingsFlow, backendFlow) { network, settings, backend ->
                 AutoTunnelState(

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,16 +0,0 @@
-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/navigation/Route.kt

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

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

@@ -9,6 +9,7 @@ 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
@@ -45,11 +46,17 @@ fun PinLockScreen(sharedViewModel: SharedAppViewModel = koinActivityViewModel())
         textColor = MaterialTheme.colorScheme.onSurface,
         onPinCorrect = { onPinCorrect() },
         onPinIncorrect = {
-            sharedViewModel.showToast(StringValue.StringResource(R.string.incorrect_pin))
+            sharedViewModel.showSnackMessage(
+                StringValue.StringResource(R.string.incorrect_pin),
+                ToastType.Warning,
+            )
         },
         onPinCreated = {
             pinCreated = true
-            sharedViewModel.showToast(StringValue.StringResource(R.string.pin_created))
+            sharedViewModel.showSnackMessage(
+                StringValue.StringResource(R.string.pin_created),
+                ToastType.Success,
+            )
             sharedViewModel.setPinLockEnabled(true)
             onPinCorrect()
         },

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

@@ -38,6 +38,7 @@ 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
@@ -51,12 +52,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
@@ -88,6 +89,9 @@ 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
@@ -99,19 +103,53 @@ 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(
-            { performBackupRestore { (context as? MainActivity)?.performBackup() } },
+            onBackup = {
-            { performBackupRestore { (context as? MainActivity)?.performRestore() } },
+                showBackupSheet = false
-        ) {
+                isRestoreAction = false
-            showBackupSheet = 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 },
+        )
+    }
+
     if (showAppModeSheet)
         AppModeBottomSheet(sharedViewModel::setAppMode, uiState.settings.tunnelMode) {
             showAppModeSheet = false
@@ -168,7 +206,8 @@ fun SettingsScreen(
                             StringValue.StringResource(
                                 R.string.mode_disabled_template,
                                 appMode.asString(context),
-                            )
+                            ),
+                            ToastType.Info,
                         )
                 },
             )

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

@@ -0,0 +1,146 @@
+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/logs/LogsScreen.kt

@@ -12,6 +12,7 @@ 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
@@ -86,13 +87,15 @@ fun LogsScreen(
             },
             onCanceled = {
                 sharedViewModel.showSnackMessage(
-                    StringValue.StringResource(R.string.export_canceled)
+                    StringValue.StringResource(R.string.export_canceled),
+                    ToastType.Warning,
                 )
                 showLogsSheet = false
             },
             onUnsupported = {
                 sharedViewModel.showSnackMessage(
-                    StringValue.StringResource(R.string.export_unsupported)
+                    StringValue.StringResource(R.string.export_unsupported),
+                    ToastType.Warning,
                 )
                 showLogsSheet = false
             },

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

@@ -1,10 +1,12 @@
 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
@@ -18,7 +20,13 @@ fun LogList(
 ) {
     LazyColumn(
         state = lazyColumnListState,
-        modifier = modifier.padding(horizontal = 12.dp),
+        modifier =
+            modifier
+                .padding(horizontal = 12.dp)
+                .scrollbar(
+                    state = lazyColumnListState.scrollIndicatorState,
+                    orientation = Orientation.Vertical,
+                ),
         verticalArrangement = Arrangement.spacedBy(2.dp),
     ) {
         itemsIndexed(items = logs, key = { index, _ -> index }) { _, log -> LogItem(log = log) }

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

@@ -26,6 +26,7 @@ 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
@@ -37,8 +38,10 @@ 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
@@ -49,12 +52,13 @@ 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
 
@@ -63,11 +67,24 @@ 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 "" }"
@@ -95,6 +112,19 @@ 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,
@@ -115,19 +145,19 @@ fun SupportScreen(viewModel: SupportViewModel = koinViewModel()) {
             )
             SurfaceRow(
                 stringResource(R.string.docs_description),
-                onClick = { context.openWebUrl(context.getString(R.string.docs_url)) },
+                onClick = { openWebUrl(docsUrl) },
                 leading = { Icon(Icons.Outlined.Book, contentDescription = null) },
                 trailing = { Icon(Icons.AutoMirrored.Outlined.Launch, null) },
             )
             SurfaceRow(
                 stringResource(R.string.website),
-                onClick = { context.openWebUrl(context.getString(R.string.website_url)) },
+                onClick = { openWebUrl(websiteUrl) },
                 leading = { Icon(Icons.Outlined.Web, contentDescription = null) },
                 trailing = { Icon(Icons.AutoMirrored.Outlined.Launch, null) },
             )
             SurfaceRow(
                 stringResource(R.string.translation),
-                onClick = { context.openWebUrl(context.getString(R.string.translation_url)) },
+                onClick = { openWebUrl(translationUrl) },
                 description = { DescriptionText(stringResource(R.string.help_translate)) },
                 leading = { Icon(Icons.Outlined.Translate, contentDescription = null) },
                 trailing = { Icon(Icons.AutoMirrored.Outlined.Launch, null) },
@@ -141,14 +171,16 @@ 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 = { context.openWebUrl(context.getString(R.string.privacy_policy_url)) },
+                onClick = { openWebUrl(privacyPolicyUrl) },
             )
             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() },
+                    onClick = {
+                        context.launchPlayStoreReview().onFailure { openWebUrl(playReviewsUrl) }
+                    },
                 )
             }
         }
@@ -167,7 +199,7 @@ fun SupportScreen(viewModel: SupportViewModel = koinViewModel()) {
                 },
                 title = stringResource(R.string.join_matrix),
                 trailing = { Icon(Icons.AutoMirrored.Outlined.Launch, null) },
-                onClick = { context.openWebUrl(context.getString(R.string.matrix_url)) },
+                onClick = { openWebUrl(matrixUrl) },
             )
             SurfaceRow(
                 leading = {
@@ -179,7 +211,7 @@ fun SupportScreen(viewModel: SupportViewModel = koinViewModel()) {
                 },
                 title = stringResource(R.string.join_telegram),
                 trailing = { Icon(Icons.AutoMirrored.Outlined.Launch, null) },
-                onClick = { context.openWebUrl(context.getString(R.string.telegram_url)) },
+                onClick = { openWebUrl(telegramUrl) },
             )
             SurfaceRow(
                 leading = {
@@ -191,13 +223,24 @@ fun SupportScreen(viewModel: SupportViewModel = koinViewModel()) {
                 },
                 title = stringResource(R.string.open_issue),
                 trailing = { Icon(Icons.AutoMirrored.Outlined.Launch, null) },
-                onClick = { context.openWebUrl(context.getString(R.string.github_url)) },
+                onClick = { openWebUrl(issuesUrl) },
             )
             SurfaceRow(
                 leading = { Icon(Icons.Outlined.Mail, contentDescription = null) },
                 title = stringResource(R.string.email_description),
                 trailing = { Icon(Icons.AutoMirrored.Outlined.Launch, null) },
-                onClick = { context.launchSupportEmail() },
+                onClick = {
+                    context.launchSupportEmail().onFailure {
+                        scope.launch {
+                            viewModel.postSideEffect(
+                                GlobalSideEffect.Snackbar(
+                                    StringValue.StringResource(R.string.no_email_detected),
+                                    ToastType.Error,
+                                )
+                            )
+                        }
+                    }
+                },
             )
         }
         Column {
@@ -222,12 +265,21 @@ fun SupportScreen(viewModel: SupportViewModel = koinViewModel()) {
                 leading = { Icon(Icons.Outlined.InstallMobile, contentDescription = null) },
                 title = stringResource(R.string.check_for_update),
                 onClick = {
-                    if (BuildConfig.DEBUG)
+                    if (BuildConfig.DEBUG) {
-                        return@SurfaceRow context.showToast(R.string.update_check_unsupported)
+                        scope.launch {
+                            viewModel.postSideEffect(
+                                GlobalSideEffect.Snackbar(
+                                    StringValue.StringResource(R.string.update_check_unsupported),
+                                    ToastType.Warning,
+                                )
+                            )
+                        }
+                        return@SurfaceRow
+                    }
                     when (BuildConfig.FLAVOR) {
-                        Constants.GOOGLE_PLAY_FLAVOR -> context.launchPlayStoreListing()
+                        Constants.GOOGLE_PLAY_FLAVOR ->
-                        Constants.FDROID_FLAVOR ->
+                            context.launchPlayStoreListing().onFailure { openWebUrl(playStoreUrl) }
-                            context.openWebUrl(context.getString(R.string.fdroid_url))
+                        Constants.FDROID_FLAVOR -> openWebUrl(izzyUrl)
                         else -> viewModel.checkForStandaloneUpdate()
                     }
                 },

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

@@ -1,10 +1,12 @@
 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
@@ -13,10 +15,17 @@ 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(rememberScrollState()),
+        modifier =
+            Modifier.fillMaxSize()
+                .verticalScroll(scrollState)
+                .scrollbar(
+                    state = scrollState.scrollIndicatorState,
+                    orientation = Orientation.Vertical,
+                ),
     ) {
         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,6 +2,7 @@ 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
@@ -9,11 +10,13 @@ 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
@@ -24,8 +27,17 @@ import com.zaneschepke.wireguardautotunnel.util.extensions.openWebUrl
 @Composable
 fun LicenseList(licenses: List<LicenseFileEntry>) {
     val context = LocalContext.current
+    val lazyListState = rememberLazyListState()
 
-    LazyColumn(modifier = Modifier.fillMaxSize()) {
+    LazyColumn(
+        modifier =
+            Modifier.fillMaxSize()
+                .scrollbar(
+                    state = lazyListState.scrollIndicatorState,
+                    orientation = Orientation.Vertical,
+                ),
+        state = lazyListState,
+    ) {
         items(licenses) { entry ->
             Row(
                 verticalAlignment = Alignment.CenterVertically,

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

@@ -13,6 +13,7 @@ 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
@@ -50,11 +51,15 @@ fun TunnelsScreen(sharedViewModel: SharedAppViewModel = koinActivityViewModel())
         rememberFileExportLauncherForResult(
             onSuccess = { uri -> sharedViewModel.exportSelectedTunnels(uri) },
             onCanceled = {
-                sharedViewModel.showToast(StringValue.StringResource(R.string.export_canceled))
+                sharedViewModel.showSnackMessage(
+                    StringValue.StringResource(R.string.export_canceled),
+                    ToastType.Warning,
+                )
             },
             onUnsupported = {
                 sharedViewModel.showSnackMessage(
-                    StringValue.StringResource(R.string.export_unsupported)
+                    StringValue.StringResource(R.string.export_unsupported),
+                    ToastType.Warning,
                 )
             },
         )
@@ -73,7 +78,8 @@ fun TunnelsScreen(sharedViewModel: SharedAppViewModel = koinActivityViewModel())
                     selectedTunnelsExportLauncher.launch(fileName)
                 } else {
                     sharedViewModel.showSnackMessage(
-                        StringValue.StringResource(R.string.error_no_file_explorer)
+                        StringValue.StringResource(R.string.error_no_file_explorer),
+                        ToastType.Error,
                     )
                 }
             }
@@ -87,7 +93,8 @@ fun TunnelsScreen(sharedViewModel: SharedAppViewModel = koinActivityViewModel())
         rememberFileImportLauncherForResult(
             onNoFileExplorer = {
                 sharedViewModel.showSnackMessage(
-                    StringValue.StringResource(R.string.error_no_file_explorer)
+                    StringValue.StringResource(R.string.error_no_file_explorer),
+                    ToastType.Error,
                 )
             },
             onData = { data -> sharedViewModel.importFromUri(data) },
@@ -101,13 +108,15 @@ fun TunnelsScreen(sharedViewModel: SharedAppViewModel = koinActivityViewModel())
                 }
                 QRResult.QRMissingPermission -> {
                     sharedViewModel.showSnackMessage(
-                        StringValue.StringResource(R.string.camera_permission_required)
+                        StringValue.StringResource(R.string.camera_permission_required),
+                        ToastType.Warning,
                     )
                 }
                 is QRResult.QRSuccess -> {
                     result.content.rawValue?.let { sharedViewModel.importFromQr(it) }
                         ?: sharedViewModel.showSnackMessage(
-                            StringValue.StringResource(R.string.config_error)
+                            StringValue.StringResource(R.string.config_error),
+                            ToastType.Error,
                         )
                 }
                 QRResult.QRUserCanceled -> Unit
@@ -119,7 +128,8 @@ fun TunnelsScreen(sharedViewModel: SharedAppViewModel = koinActivityViewModel())
             ->
             if (!isGranted) {
                 sharedViewModel.showSnackMessage(
-                    StringValue.StringResource(R.string.camera_permission_required)
+                    StringValue.StringResource(R.string.camera_permission_required),
+                    ToastType.Warning,
                 )
                 return@rememberLauncherForActivityResult
             }

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

@@ -43,11 +43,7 @@ fun PeerStatisticsSection(peer: ActivePeer) {
             color = color,
         )
         peer.endpoint?.let {
-            StatText(
+            StatText(stringResource(R.string.endpoint_template, it), style = style, color = color)
-                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.lowercase(), style = style, color = color)
+        Text(text = text, style = style, color = color)
     }
 }

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

@@ -1,6 +1,7 @@
 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
@@ -12,10 +13,10 @@ 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.produceState
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -36,8 +37,6 @@ import com.zaneschepke.wireguardautotunnel.ui.state.DisplayTunnelState
 import com.zaneschepke.wireguardautotunnel.ui.state.TunnelsUiState
 import com.zaneschepke.wireguardautotunnel.util.extensions.openWebUrl
 import com.zaneschepke.wireguardautotunnel.viewmodel.SharedAppViewModel
-import kotlin.time.Duration.Companion.milliseconds
-import kotlinx.coroutines.delay
 
 @OptIn(ExperimentalFoundationApi::class)
 @Composable
@@ -50,14 +49,6 @@ fun TunnelList(
     val context = LocalContext.current
     val isTv = LocalIsAndroidTV.current
 
-    val now by
-        produceState(System.currentTimeMillis()) {
-            while (true) {
-                delay(1_000L.milliseconds)
-                value = System.currentTimeMillis()
-            }
-        }
-
     val focusRequester = remember { FocusRequester() }
 
     LaunchedEffect(Unit) {
@@ -78,7 +69,11 @@ fun TunnelList(
                         viewModel.clearSelectedTunnels()
                     }
                 }
-                .overscroll(rememberOverscrollEffect()),
+                .overscroll(rememberOverscrollEffect())
+                .scrollbar(
+                    state = lazyListState.scrollIndicatorState,
+                    orientation = Orientation.Vertical,
+                ),
         state = lazyListState,
         userScrollEnabled = true,
         reverseLayout = false,
@@ -99,10 +94,7 @@ fun TunnelList(
                     uiState.backendStatus.activeTunnels[tunnel.id] ?: ActiveTunnel()
                 }
 
-            val displayState =
+            val displayState = remember(activeTunnel) { DisplayTunnelState.from(activeTunnel) }
-                remember(activeTunnel, now, uiState.displayStates[tunnel.id]) {
-                    uiState.displayStates[tunnel.id] ?: DisplayTunnelState.from(activeTunnel, now)
-                }
 
             val isRunning = uiState.backendStatus.activeTunnels.containsKey(tunnel.id)
 

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

@@ -1,5 +1,6 @@
 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
@@ -9,6 +10,7 @@ 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
@@ -26,14 +28,16 @@ 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
@@ -57,6 +61,8 @@ fun ConfigScreen(
 
     var showQrModal by rememberSaveable { mutableStateOf(false) }
 
+    val scrollState = rememberScrollState()
+
     val rawConfig by
         remember(liveConfig, uiState.activeConfig, uiState.tunnel?.quickConfig) {
             derivedStateOf {
@@ -72,7 +78,12 @@ fun ConfigScreen(
         when (sideEffect) {
             is LocalSideEffect.Modal.QR -> {
                 if (tunnel.quickConfig.isTextTooLargeForQr()) {
-                    context.showToast(R.string.text_too_large_for_qr)
+                    sharedViewModel.postSideEffect(
+                        GlobalSideEffect.Snackbar(
+                            StringValue.StringResource(R.string.text_too_large_for_qr),
+                            ToastType.Error,
+                        )
+                    )
                 } else {
                     showQrModal = true
                 }
@@ -90,7 +101,13 @@ fun ConfigScreen(
     Column(
         horizontalAlignment = Alignment.Start,
         verticalArrangement = Arrangement.spacedBy(12.dp, Alignment.Top),
-        modifier = Modifier.fillMaxSize().verticalScroll(rememberScrollState()),
+        modifier =
+            Modifier.fillMaxSize()
+                .verticalScroll(scrollState)
+                .scrollbar(
+                    state = scrollState.scrollIndicatorState,
+                    orientation = Orientation.Vertical,
+                ),
     ) {
         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,5 +1,6 @@
 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
@@ -12,6 +13,7 @@ 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
@@ -49,11 +51,12 @@ 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 -> {
@@ -104,7 +107,14 @@ fun ConfigEditScreen(
     Column(
         horizontalAlignment = Alignment.Start,
         verticalArrangement = Arrangement.spacedBy(16.dp, Alignment.Top),
-        modifier = Modifier.fillMaxSize().imePadding().verticalScroll(rememberScrollState()),
+        modifier =
+            Modifier.fillMaxSize()
+                .imePadding()
+                .verticalScroll(scrollState)
+                .scrollbar(
+                    state = scrollState.scrollIndicatorState,
+                    orientation = Orientation.Vertical,
+                ),
     ) {
         if (uiState.isGlobalConfig) {
             Column {

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

@@ -1,5 +1,6 @@
 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
@@ -17,6 +18,7 @@ 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
@@ -107,7 +109,11 @@ fun SortScreen(sharedViewModel: SharedAppViewModel = koinActivityViewModel()) {
             Modifier.pointerInput(Unit) {
                     if (tunnelsUiState.tunnels.isEmpty()) return@pointerInput
                 }
-                .overscroll(rememberOverscrollEffect()),
+                .overscroll(rememberOverscrollEffect())
+                .scrollbar(
+                    state = lazyListState.scrollIndicatorState,
+                    orientation = Orientation.Vertical,
+                ),
         state = lazyListState,
         userScrollEnabled = true,
         reverseLayout = false,

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

@@ -26,97 +26,57 @@ sealed class DisplayTunnelState {
 
     data object Connected : DisplayTunnelState()
 
-    data object Degraded : DisplayTunnelState()
+    data object HandshakeFailure : DisplayTunnelState()
 
     @StringRes
-    fun labelRes(): Int {
+    fun labelRes(): Int =
-        return when (this) {
+        when (this) {
             Disconnected -> R.string.tunnel_state_disconnected
-            Connecting -> R.string.tunnel_state_starting
+            Connecting,
-            ResolvingDns -> R.string.tunnel_state_resolving_dns
             EstablishingConnection -> R.string.tunnel_state_establishing_connection
+            ResolvingDns -> R.string.tunnel_state_resolving_dns
             Ready -> R.string.ready
             Connected -> R.string.tunnel_state_connected
-            Degraded -> R.string.tunnel_state_handshake_failure
+            HandshakeFailure -> R.string.tunnel_state_handshake_failure
+        }
+
+    fun asColor(): Color =
+        when (this) {
+            Disconnected -> CoolGray
+            Connecting,
+            ResolvingDns,
+            EstablishingConnection,
+            Ready -> Straw
+            Connected -> SilverTree
+            HandshakeFailure -> AlertRed
         }
-    }
 
     fun asLocalizedString(context: Context): String {
         return context.getString(labelRes())
     }
 
-    fun asColor(): Color {
-        return when (this) {
-            Disconnected -> CoolGray
-
-            Connecting,
-            ResolvingDns,
-            EstablishingConnection,
-            Ready -> Straw
-
-            Connected -> SilverTree
-
-            Degraded -> AlertRed
-        }
-    }
-
     companion object {
-        private const val HANDSHAKE_FAILURE_DEGRADED_THRESHOLD_MS = 6_000L
+        fun from(activeTunnel: ActiveTunnel): DisplayTunnelState {
-
-        // During this window we avoid showing Degraded even if we see HandshakeFailure
-        private const val POST_RESOLUTION_GRACE_PERIOD_MS = 3_500L
-
-        fun from(activeTunnel: ActiveTunnel, now: Long): DisplayTunnelState {
             val transport = activeTunnel.transportState
             val bootstrap = activeTunnel.bootstrapState
             val mode = activeTunnel.mode
             val isVpnStyle = mode is BackendMode.Vpn || mode is BackendMode.Proxy.KillSwitchPrimary
 
-            val bootstrapPhaseDone =
-                bootstrap is BootstrapState.Complete || bootstrap is BootstrapState.None
-
-            // Check if we recently completed peer resolution
-            val recentlyResolvedPeers =
-                activeTunnel.lastPeerUpdateMs > 0 &&
-                    (now - activeTunnel.lastPeerUpdateMs) < POST_RESOLUTION_GRACE_PERIOD_MS
-
             return when {
                 transport is Tunnel.State.Down -> Disconnected
-
+                bootstrap is BootstrapState.Failed -> HandshakeFailure
-                bootstrap is BootstrapState.Failed -> Degraded
 
                 bootstrap is BootstrapState.ResolvingDns ||
                     bootstrap is BootstrapState.UpdatingPeers -> ResolvingDns
 
                 transport is Tunnel.State.Up.Healthy -> Connected
 
-                transport is Tunnel.State.Up.HandshakeFailure -> {
+                transport is Tunnel.State.Up.HandshakeFailure -> HandshakeFailure
-                    val age = now - activeTunnel.lastStateChangeMs
 
-                    if (recentlyResolvedPeers && bootstrapPhaseDone) {
+                transport is Tunnel.State.Starting ->
-                        if (isVpnStyle) EstablishingConnection else Ready
+                    if (isVpnStyle) EstablishingConnection else Ready
-                    } else if (
-                        age > HANDSHAKE_FAILURE_DEGRADED_THRESHOLD_MS && bootstrapPhaseDone
-                    ) {
-                        Degraded
-                    } else if (isVpnStyle && bootstrapPhaseDone) {
-                        EstablishingConnection
-                    } else if (bootstrapPhaseDone) {
-                        Ready
-                    } else {
-                        Connecting
-                    }
-                }
 
-                transport is Tunnel.State.Starting -> {
+                else -> if (isVpnStyle) EstablishingConnection else Ready
-                    when {
-                        bootstrapPhaseDone -> if (isVpnStyle) EstablishingConnection else Ready
-                        else -> Connecting
-                    }
-                }
-
-                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)
 
-// Config colors
+// Other 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,13 +14,12 @@ 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.core.service.tile.AutoTunnelControlTile
+import com.zaneschepke.wireguardautotunnel.service.tile.AutoTunnelControlTile
-import com.zaneschepke.wireguardautotunnel.core.service.tile.TunnelControlTile
+import com.zaneschepke.wireguardautotunnel.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
@@ -30,17 +29,11 @@ import java.util.Locale
 import kotlin.system.exitProcess
 import timber.log.Timber
 
-fun Context.openWebUrl(url: String): Result<Unit> {
+fun Context.openWebUrl(url: String): Result<Unit> = runCatching {
-    return kotlin
+    val webpage: Uri = url.toUri()
-        .runCatching {
+    val intent =
-            val webpage: Uri = url.toUri()
+        Intent(Intent.ACTION_VIEW, webpage).apply { addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) }
-            val intent =
+    startActivity(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 {
@@ -109,15 +102,7 @@ fun Context.launchShareFile(file: File) {
     this.startActivity(chooserIntent)
 }
 
-fun Context.showToast(resId: Int) {
+fun Context.launchSupportEmail(): Result<Unit> = runCatching {
-    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()
@@ -132,7 +117,7 @@ fun Context.launchSupportEmail() {
             }
         )
     } else {
-        showToast(R.string.no_email_detected)
+        throw IllegalStateException("No email client found")
     }
 }
 
@@ -252,9 +237,9 @@ fun Context.installApk(apkFile: File) {
     startActivity(intent)
 }
 
-fun Context.launchPlayStoreListing() {
+fun Context.launchPlayStoreListing(): Result<Unit> = runCatching {
     val intent =
-        Intent(Intent.ACTION_VIEW, Uri.parse("market://details?id=$packageName")).apply {
+        Intent(Intent.ACTION_VIEW, "market://details?id=$packageName".toUri()).apply {
             addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
             setPackage("com.android.vending")
         }
@@ -262,12 +247,12 @@ fun Context.launchPlayStoreListing() {
     if (intent.resolveActivity(packageManager) != null) {
         startActivity(intent)
     } else {
-        openWebUrl("https://play.google.com/store/apps/details?id=$packageName")
+        throw IllegalStateException("Play Store not found")
     }
 }
 
-fun Context.launchPlayStoreReview() {
+fun Context.launchPlayStoreReview(): Result<Unit> = runCatching {
-    val uri = Uri.parse("market://details?id=$packageName&showAllReviews=true")
+    val uri = "market://details?id=$packageName&showAllReviews=true".toUri()
     val intent =
         Intent(Intent.ACTION_VIEW, uri).apply {
             addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
@@ -276,7 +261,7 @@ fun Context.launchPlayStoreReview() {
     if (intent.resolveActivity(packageManager) != null) {
         startActivity(intent)
     } else {
-        openWebUrl("https://play.google.com/store/apps/details?id=$packageName&showAllReviews=true")
+        throw IllegalStateException("Play Store not found")
     }
 }
 

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

@@ -124,7 +124,7 @@ fun DnsError.labelRes(): Int {
 fun ActiveTunnel.statusText(context: Context): String {
     return context.getString(
         R.string.status_template,
-        DisplayTunnelState.from(this, System.currentTimeMillis()).asLocalizedString(context),
+        DisplayTunnelState.from(this).asLocalizedString(context),
     )
 }
 

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

@@ -2,13 +2,12 @@ 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.backend.RootShell
+import com.zaneschepke.tunnel.util.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
@@ -16,6 +15,8 @@ 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
@@ -99,7 +100,10 @@ class AutoTunnelViewModel(
         val trimmed = name.trim()
         if (state.autoTunnelSettings.trustedNetworkSSIDs.contains(name)) {
             return@intent postSideEffect(
-                GlobalSideEffect.Snackbar(StringValue.StringResource(R.string.error_ssid_exists))
+                GlobalSideEffect.Snackbar(
+                    StringValue.StringResource(R.string.error_ssid_exists),
+                    ToastType.Error,
+                )
             )
         }
         setTrustedNetworkNames(
@@ -153,11 +157,19 @@ class AutoTunnelViewModel(
         when (method) {
             WifiDetectionMethod.ROOT -> {
                 val accepted = RootShell.requestRootPermission()
-                val message =
+                if (!accepted)
-                    if (!accepted) StringValue.StringResource(R.string.error_root_denied)
+                    return@intent postSideEffect(
-                    else StringValue.StringResource(R.string.root_accepted)
+                        GlobalSideEffect.Snackbar(
-                postSideEffect(GlobalSideEffect.Snackbar(message))
+                            StringValue.StringResource(R.string.error_root_denied),
-                if (!accepted) return@intent
+                            ToastType.Error,
+                        )
+                    )
+                postSideEffect(
+                    GlobalSideEffect.Snackbar(
+                        StringValue.StringResource(R.string.root_accepted),
+                        ToastType.Success,
+                    )
+                )
             }
             WifiDetectionMethod.SHIZUKU -> {
                 requestShizuku()
@@ -188,7 +200,10 @@ class AutoTunnelViewModel(
             )
         } catch (_: Exception) {
             postSideEffect(
-                GlobalSideEffect.Snackbar(StringValue.StringResource(R.string.shizuku_not_detected))
+                GlobalSideEffect.Snackbar(
+                    StringValue.StringResource(R.string.shizuku_not_detected),
+                    ToastType.Error,
+                )
             )
         }
     }

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

@@ -1,6 +1,7 @@
 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
@@ -105,7 +106,10 @@ class ConfigEditViewModel(
         if (state.isTunnelNameTaken) {
 
             postSideEffect(
-                GlobalSideEffect.Snackbar(StringValue.StringResource(R.string.tunnel_name_taken))
+                GlobalSideEffect.Snackbar(
+                    StringValue.StringResource(R.string.tunnel_name_taken),
+                    ToastType.Error,
+                )
             )
 
             return@intent
@@ -113,7 +117,10 @@ class ConfigEditViewModel(
 
         if (state.draft.tunnelName.isBlank()) {
             postSideEffect(
-                GlobalSideEffect.Snackbar(StringValue.StringResource(R.string.name_error_empty))
+                GlobalSideEffect.Snackbar(
+                    StringValue.StringResource(R.string.name_error_empty),
+                    ToastType.Error,
+                )
             )
             return@intent
         }
@@ -147,8 +154,9 @@ class ConfigEditViewModel(
                     }
 
                     postSideEffect(
-                        GlobalSideEffect.Toast(
+                        GlobalSideEffect.Snackbar(
-                            StringValue.StringResource(R.string.config_changes_saved)
+                            StringValue.StringResource(R.string.config_changes_saved),
+                            ToastType.Success,
                         )
                     )
 
@@ -164,7 +172,7 @@ class ConfigEditViewModel(
                         else -> StringValue.StringResource(R.string.unknown_error)
                     }
 
-                postSideEffect(GlobalSideEffect.Snackbar(message))
+                postSideEffect(GlobalSideEffect.Snackbar(message, ToastType.Error))
             }
     }
 

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

@@ -1,6 +1,7 @@
 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
@@ -9,7 +10,6 @@ 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 = SnackbarType.WARNING,
+                        type = ToastType.Error,
                     )
                 )
                 return@intent
@@ -87,7 +87,10 @@ class DnsViewModel(
 
         postSideEffect(GlobalSideEffect.PopBackStack)
         postSideEffect(
-            GlobalSideEffect.Toast(StringValue.StringResource(R.string.config_changes_saved))
+            GlobalSideEffect.Snackbar(
+                StringValue.StringResource(R.string.config_changes_saved),
+                ToastType.Success,
+            )
         )
     }
 

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

@@ -1,6 +1,7 @@
 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
@@ -52,7 +53,10 @@ class LockdownViewModel(
 
         postSideEffect(GlobalSideEffect.PopBackStack)
         postSideEffect(
-            GlobalSideEffect.Toast(StringValue.StringResource(R.string.config_changes_saved))
+            GlobalSideEffect.Snackbar(
+                StringValue.StringResource(R.string.config_changes_saved),
+                ToastType.Success,
+            )
         )
     }
 

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

@@ -2,6 +2,7 @@ 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
@@ -61,7 +62,10 @@ class LoggerViewModel(
     fun exportLogs(uri: Uri?) = intent {
         if (uri == null) {
             postSideEffect(
-                GlobalSideEffect.Toast(StringValue.StringResource(R.string.export_unsupported))
+                GlobalSideEffect.Snackbar(
+                    StringValue.StringResource(R.string.export_unsupported),
+                    ToastType.Warning,
+                )
             )
             return@intent
         }
@@ -76,11 +80,12 @@ class LoggerViewModel(
             Timber.e(action)
             intent {
                 postSideEffect(
-                    GlobalSideEffect.Toast(
+                    GlobalSideEffect.Snackbar(
                         StringValue.StringResource(
                             R.string.export_failed,
                             ": ${action.localizedMessage}",
-                        )
+                        ),
+                        ToastType.Error,
                     )
                 )
             }

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

@@ -1,6 +1,7 @@
 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
@@ -79,7 +80,8 @@ class ProxySettingsViewModel(
             if (socksPort == null || httpPort == null || socksPort == httpPort) {
                 return@intent postSideEffect(
                     GlobalSideEffect.Snackbar(
-                        StringValue.StringResource(R.string.ports_must_differ)
+                        StringValue.StringResource(R.string.ports_must_differ),
+                        ToastType.Error,
                     )
                 )
             }
@@ -96,7 +98,10 @@ class ProxySettingsViewModel(
 
         if (updated.proxyPassword?.any { it.isWhitespace() } == true) {
             postSideEffect(
-                GlobalSideEffect.Snackbar(StringValue.StringResource(R.string.password_no_spaces))
+                GlobalSideEffect.Snackbar(
+                    StringValue.StringResource(R.string.password_no_spaces),
+                    ToastType.Error,
+                )
             )
             return@intent reduce { state.copy(isPasswordError = true) }
         }
@@ -104,7 +109,10 @@ class ProxySettingsViewModel(
         proxySettingsRepository.upsert(updated)
 
         postSideEffect(
-            GlobalSideEffect.Snackbar(StringValue.StringResource(R.string.config_changes_saved))
+            GlobalSideEffect.Snackbar(
+                StringValue.StringResource(R.string.config_changes_saved),
+                ToastType.Success,
+            )
         )
         postSideEffect(GlobalSideEffect.PopBackStack)
     }

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

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

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

@@ -3,11 +3,10 @@ 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
@@ -17,6 +16,8 @@ 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
@@ -73,17 +74,11 @@ class SharedAppViewModel(
                 tunnelCoordinator.backendStatus,
                 selectedTunnelsRepository.flow,
             ) { tunnels, backendStatus, selectedTuns ->
-                val activeTunnelIds = backendStatus.activeTunnels.keys
+                val sortedTunnels = tunnels.sortedBy { it.position }
-
-                val sortedTunnels =
-                    tunnels.sortedWith(
-                        compareByDescending<TunnelConfig> { it.id in activeTunnelIds }
-                            .thenBy { it.position }
-                    )
 
                 val displayStates =
                     backendStatus.activeTunnels.mapValues { (_, activeTunnel) ->
-                        DisplayTunnelState.from(activeTunnel, System.currentTimeMillis())
+                        DisplayTunnelState.from(activeTunnel)
                     }
 
                 TunnelsUiState(
@@ -183,6 +178,10 @@ 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)
     }
@@ -193,12 +192,6 @@ 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)
     }
@@ -206,14 +199,20 @@ 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))
+            GlobalSideEffect.Snackbar(
+                StringValue.StringResource(R.string.config_changes_saved),
+                ToastType.Success,
+            )
         )
         postSideEffect(GlobalSideEffect.PopBackStack)
     }
 
     fun sortByLatency(tunnels: List<TunnelConfig>) = intent {
         postSideEffect(
-            GlobalSideEffect.Snackbar(StringValue.StringResource(R.string.pinging_servers))
+            GlobalSideEffect.Snackbar(
+                StringValue.StringResource(R.string.pinging_servers),
+                ToastType.Info,
+            )
         )
         val sortedResult =
             withContext(Dispatchers.IO) {
@@ -255,12 +254,17 @@ class SharedAppViewModel(
                 TunnelConfig.tunnelConfFromQuick(config, name)
             }
             tunnelRepository.saveTunnelsUniquely(tunnelConfigs, state.tunnelNames.map { it.value })
-        } catch (_: IOException) {
+        } catch (e: Exception) {
-            postSideEffect(
+            if (e is ConfigParseException) {
-                GlobalSideEffect.Snackbar(StringValue.StringResource(R.string.read_failed))
+                postSideEffect(GlobalSideEffect.Snackbar(e.asStringValue(), ToastType.Error))
-            )
+            } else {
-        } catch (e: ConfigParseException) {
+                postSideEffect(
-            postSideEffect(GlobalSideEffect.Snackbar(e.asStringValue()))
+                    GlobalSideEffect.Snackbar(
+                        StringValue.StringResource(R.string.config_error),
+                        ToastType.Error,
+                    )
+                )
+            }
         }
     }
 
@@ -285,7 +289,10 @@ class SharedAppViewModel(
         } catch (e: Exception) {
             Timber.e(e)
             postSideEffect(
-                GlobalSideEffect.Toast(StringValue.StringResource(R.string.error_download_failed))
+                GlobalSideEffect.Snackbar(
+                    StringValue.StringResource(R.string.error_download_failed),
+                    ToastType.Error,
+                )
             )
         }
     }
@@ -300,7 +307,7 @@ class SharedAppViewModel(
                         is IOException -> StringValue.StringResource(R.string.error_download_failed)
                         else -> StringValue.StringResource(R.string.error_file_extension)
                     }
-                postSideEffect(GlobalSideEffect.Toast(message))
+                postSideEffect(GlobalSideEffect.Snackbar(message, ToastType.Error))
             }
     }
 
@@ -332,7 +339,8 @@ class SharedAppViewModel(
         if (selectedTuns.any { activeTunIds?.contains(it.id) == true })
             return@intent postSideEffect(
                 GlobalSideEffect.Snackbar(
-                    StringValue.StringResource(R.string.delete_active_message)
+                    StringValue.StringResource(R.string.delete_active_message),
+                    ToastType.Error,
                 )
             )
         tunnelRepository.delete(selectedTuns)
@@ -355,11 +363,12 @@ class SharedAppViewModel(
         val onFailure = { action: Throwable ->
             intent {
                 postSideEffect(
-                    GlobalSideEffect.Toast(
+                    GlobalSideEffect.Snackbar(
                         StringValue.StringResource(
                             R.string.export_failed,
                             ": ${action.localizedMessage}",
-                        )
+                        ),
+                        ToastType.Error,
                     )
                 )
             }
@@ -376,7 +385,10 @@ class SharedAppViewModel(
                     if (it.exists()) it.delete()
                 }
                 postSideEffect(
-                    GlobalSideEffect.Snackbar(StringValue.StringResource(R.string.export_success))
+                    GlobalSideEffect.Snackbar(
+                        StringValue.StringResource(R.string.export_success),
+                        ToastType.Success,
+                    )
                 )
                 clearSelectedTunnels()
             }

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

@@ -1,6 +1,7 @@
 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
@@ -88,9 +89,14 @@ class SplitTunnelViewModel(
             editableInterface.copy(includedApplications = included, excludedApplications = excluded)
         val updatedProxyConfig = editableConfig.copy(`interface` = updatedInterface)
         val updatedConfig = updatedProxyConfig.buildConfig()
-        tunnelRepository.save(tunnel.copy(quickConfig = updatedConfig.asQuickString()))
+        tunnelRepository.save(
+            tunnel.copy(quickConfig = updatedConfig.withName(tunnel.name).asQuickString())
+        )
         postSideEffect(
-            GlobalSideEffect.Snackbar(StringValue.StringResource(R.string.config_changes_saved))
+            GlobalSideEffect.Snackbar(
+                StringValue.StringResource(R.string.config_changes_saved),
+                ToastType.Success,
+            )
         )
         postSideEffect(GlobalSideEffect.PopBackStack)
     }

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

@@ -1,6 +1,7 @@
 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
@@ -25,7 +26,10 @@ class SupportViewModel(
 
     fun checkForStandaloneUpdate() = intent {
         postSideEffect(
-            GlobalSideEffect.Toast(StringValue.StringResource(R.string.checking_for_update))
+            GlobalSideEffect.Snackbar(
+                StringValue.StringResource(R.string.checking_for_update),
+                ToastType.Info,
+            )
         )
         reduce { state.copy(isLoading = true) }
         updateRepository
@@ -33,15 +37,19 @@ class SupportViewModel(
             .onSuccess { update ->
                 if (update == null) {
                     postSideEffect(
-                        GlobalSideEffect.Toast(
+                        GlobalSideEffect.Snackbar(
-                            StringValue.StringResource(R.string.latest_installed)
+                            StringValue.StringResource(R.string.latest_installed),
+                            ToastType.Info,
                         )
                     )
                 } else reduce { state.copy(appUpdate = update.sanitized()) }
             }
             .onFailure {
                 postSideEffect(
-                    GlobalSideEffect.Toast(StringValue.StringResource(R.string.update_check_failed))
+                    GlobalSideEffect.Snackbar(
+                        StringValue.StringResource(R.string.update_check_failed),
+                        ToastType.Error,
+                    )
                 )
             }
         reduce { state.copy(isLoading = false) }
@@ -83,8 +91,9 @@ class SupportViewModel(
             .onSuccess { postSideEffect(GlobalSideEffect.InstallApk(it)) }
             .onFailure {
                 postSideEffect(
-                    GlobalSideEffect.Toast(
+                    GlobalSideEffect.Snackbar(
-                        StringValue.StringResource(R.string.update_download_failed)
+                        StringValue.StringResource(R.string.update_download_failed),
+                        ToastType.Error,
                     )
                 )
             }

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

@@ -58,7 +58,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. %1$s</string>
+    <string name="backup_success">Backup success</string>
     <string name="persistent_keepalive">Persistent keepalive</string>
     <string name="info">Info</string>
     <string name="exclude">Exclude</string>

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

@@ -245,7 +245,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. %1$s</string>
+    <string name="backup_success">Úspěšně zazálohováno</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>

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

@@ -60,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. %1$s</string>
+    <string name="backup_success">Backup success</string>
     <string name="persistent_keepalive">Persistent keepalive</string>
     <string name="info">Info</string>
     <string name="exclude">Exclude</string>

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

@@ -202,7 +202,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. %1$s</string>
+    <string name="backup_success">Backuperfolg</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>

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

@@ -202,7 +202,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. %1$s</string>
+    <string name="backup_success">Copia de seguridad realizada con éxito</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>

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

@@ -194,7 +194,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. %1$s</string>
+    <string name="backup_success">Varundus õnnestus</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>

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

@@ -70,7 +70,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. %1$s</string>
+    <string name="backup_success">Backup success</string>
     <string name="persistent_keepalive">Persistent keepalive</string>
     <string name="info">Info</string>
     <string name="exclude">Exclude</string>

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

@@ -136,7 +136,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. %1$s</string>
+    <string name="backup_success">Backup success</string>
     <string name="persistent_keepalive">Persistent keepalive</string>
     <string name="info">Info</string>
     <string name="backup_failed">Failed to create backup.</string>

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

@@ -171,7 +171,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. %1$s</string>
+    <string name="backup_success">Sauvegarde réussie</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>

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

@@ -58,7 +58,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. %1$s</string>
+    <string name="backup_success">Backup success</string>
     <string name="persistent_keepalive">Persistent keepalive</string>
     <string name="info">Info</string>
     <string name="exclude">Exclude</string>

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

@@ -60,7 +60,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. %1$s</string>
+    <string name="backup_success">Sikeres mentés</string>
     <string name="persistent_keepalive">Kapcsolatmegőrzés</string>
     <string name="info">Infó</string>
     <string name="exclude">Kizárás</string>

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

@@ -116,7 +116,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. %1$s</string>
+    <string name="backup_success">Pencadangan berhasil</string>
     <string name="info">Info</string>
     <string name="exclude">Kecualikan</string>
     <string name="backup_failed">Gagal membuat cadangan.</string>

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

@@ -206,7 +206,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. %1$s</string>
+    <string name="backup_success">Bakcup riuscito</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>

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

@@ -107,7 +107,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. %1$s</string>
+    <string name="backup_success">Backup success</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>

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

@@ -166,7 +166,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. %1$s</string>
+    <string name="backup_success">Backup success</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>

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

@@ -58,7 +58,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">백업 성공. %1$s</string>
+    <string name="backup_success">백업 성공</string>
     <string name="persistent_keepalive">지속적 연결 유지</string>
     <string name="info">정보</string>
     <string name="exclude">제외</string>

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

@@ -60,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. %1$s</string>
+    <string name="backup_success">Backup success</string>
     <string name="persistent_keepalive">Persistent keepalive</string>
     <string name="info">Info</string>
     <string name="exclude">Exclude</string>

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

@@ -222,7 +222,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. %1$s</string>
+    <string name="backup_success">Backup succesvol</string>
     <string name="info">Info</string>
     <string name="backup_failed">Backup maken mislukt.</string>
     <string name="unknown">Onbekend</string>

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

@@ -58,7 +58,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. %1$s</string>
+    <string name="backup_success">Backup success</string>
     <string name="persistent_keepalive">Persistent keepalive</string>
     <string name="info">Info</string>
     <string name="exclude">Exclude</string>

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

@@ -203,7 +203,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. %1$s</string>
+    <string name="backup_success">Powodzenie tworzenia kopii zapasowej</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>

app/src/main/res/values-pt-rBR/strings.xml

@@ -157,7 +157,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. %1$s</string>
+    <string name="backup_success">Backup success</string>
     <string name="info">Info</string>
     <string name="backup_failed">Failed to create backup.</string>
     <string name="location_permissions">Location Permissions</string>

app/src/main/res/values-pt-rPT/strings.xml

@@ -158,7 +158,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. %1$s</string>
+    <string name="backup_success">Backup success</string>
     <string name="info">Info</string>
     <string name="backup_failed">Failed to create backup.</string>
     <string name="location_permissions">Location Permissions</string>

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

@@ -207,7 +207,7 @@
     <string name="backup_application">Резервирование данных</string>
     <string name="restore_application">Восстановление данных</string>
     <string name="tunnel_monitoring">Отслеживание туннеля</string>
-    <string name="backup_success">Резервное копирование выполнено. %1$s</string>
+    <string name="backup_success">Резервное копирование выполнено</string>
     <string name="restore_success">Восстановление выполнено. %1$s</string>
     <string name="root_required_template">%1$s (требуется root)</string>
     <string name="recommended_template">%1$s (рекомендуется)</string>

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

@@ -108,7 +108,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. %1$s</string>
+    <string name="backup_success">Backup success</string>
     <string name="info">Info</string>
     <string name="backup_failed">Failed to create backup.</string>
     <string name="junk_packet_minimum_size">Junk packet minimálna veľkosť</string>

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

@@ -58,7 +58,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. %1$s</string>
+    <string name="backup_success">Backup success</string>
     <string name="persistent_keepalive">Persistent keepalive</string>
     <string name="info">Info</string>
     <string name="exclude">Exclude</string>

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

@@ -198,7 +198,7 @@
     <string name="mimic_quic">Mimic QUIC</string>
     <string name="show_qr">Show QR</string>
     <string name="wifi_settings">Wi-Fi settings</string>
-    <string name="backup_success">Backup success. %1$s</string>
+    <string name="backup_success">Backup success</string>
     <string name="info">Info</string>
     <string name="backup_failed">Failed to create backup.</string>
     <string name="location_permissions">Location Permissions</string>

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

@@ -58,7 +58,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. %1$s</string>
+    <string name="backup_success">Backup success</string>
     <string name="persistent_keepalive">Persistent keepalive</string>
     <string name="info">Info</string>
     <string name="exclude">Exclude</string>

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

@@ -176,7 +176,7 @@
     <string name="mimic_quic">Mimic QUIC</string>
     <string name="show_qr">Show QR</string>
     <string name="wifi_settings">Wi-Fi settings</string>
-    <string name="backup_success">Backup success. %1$s</string>
+    <string name="backup_success">Backup success</string>
     <string name="info">Info</string>
     <string name="backup_failed">Failed to create backup.</string>
     <string name="location_permissions">Location Permissions</string>

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

@@ -165,7 +165,7 @@
     <string name="mimic_quic">Імітація QUIC</string>
     <string name="show_qr">Показати QR-код</string>
     <string name="wifi_settings">Параметри Wi-Fi</string>
-    <string name="backup_success">Рез. копіювання успішне. %1$s</string>
+    <string name="backup_success">Рез. копіювання успішне</string>
     <string name="info">Інформація</string>
     <string name="backup_failed">Не вдалося створити резервну копію.</string>
     <string name="location_permissions">Дозволи на доступ до геолокації</string>

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

@@ -202,7 +202,7 @@
     <string name="auto_tunnel_running">آٹو ٹنل چل رہا ہے</string>
     <string name="auto_tunnel_not_running">آٹو ٹنل نہیں چل رہا ہے</string>
     <string name="tunnel_monitoring">ٹنل کی نگرانی</string>
-    <string name="backup_success">بیک اپ کامیاب۔ %1$s</string>
+    <string name="backup_success">بیک اپ کامیاب۔</string>
     <string name="restore_success">بحالی کامیاب۔ %1$s</string>
     <string name="restarting_app">تبدیلیاں لاگو کرنے کے لیے ایپ کو دوبارہ شروع کیا جا رہا ہے…</string>
     <string name="restore_failed">بیک اپ سے بحالی ناکام۔</string>

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

@@ -60,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. %1$s</string>
+    <string name="backup_success">Backup success</string>
     <string name="persistent_keepalive">Persistent keepalive</string>
     <string name="info">Info</string>
     <string name="exclude">Loại trừ</string>

app/src/main/res/values-zh-rCN/strings.xml

@@ -202,7 +202,7 @@
     <string name="auto_tunnel_running">自动隧道运行中</string>
     <string name="auto_tunnel_not_running">自动隧道未运行</string>
     <string name="tunnel_monitoring">隧道监控</string>
-    <string name="backup_success">成功备份：%1$s</string>
+    <string name="backup_success">成功备份</string>
     <string name="restore_success">成功恢复：%1$s</string>
     <string name="restarting_app">正重启应用来应用更改…</string>
     <string name="restore_failed">未能从备份恢复。</string>