diff options
| author | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2025-10-16 15:07:57 +0200 |
|---|---|---|
| committer | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2025-10-22 13:06:17 +0200 |
| commit | 01e2ade8ba9c8ea4363eeca65a0d8ed989de4d2f (patch) | |
| tree | fb55d756049f478fa4be40de48b239f2059393c9 /android/lib/ui | |
| parent | 4d3129808552e247a591e074a944d95ea9916a27 (diff) | |
| download | mullvadvpn-01e2ade8ba9c8ea4363eeca65a0d8ed989de4d2f.tar.xz mullvadvpn-01e2ade8ba9c8ea4363eeca65a0d8ed989de4d2f.zip | |
Add entry and exit no relay errors
The old no relay error is still kept for single hop
Diffstat (limited to 'android/lib/ui')
3 files changed, 15 insertions, 8 deletions
diff --git a/android/lib/ui/component/build.gradle.kts b/android/lib/ui/component/build.gradle.kts index 56ec9a63ef..54cf81bdcb 100644 --- a/android/lib/ui/component/build.gradle.kts +++ b/android/lib/ui/component/build.gradle.kts @@ -24,6 +24,7 @@ android { compilerOptions { jvmTarget = JvmTarget.fromTarget(libs.versions.jvm.target.get()) allWarningsAsErrors = true + freeCompilerArgs = listOf("-XXLanguage:+WhenGuards") } } diff --git a/android/lib/ui/component/src/main/kotlin/net/mullvad/mullvadvpn/lib/ui/component/AnimatedNotificationBanner.kt b/android/lib/ui/component/src/main/kotlin/net/mullvad/mullvadvpn/lib/ui/component/AnimatedNotificationBanner.kt index b9799fab33..2ed3ca4b0f 100644 --- a/android/lib/ui/component/src/main/kotlin/net/mullvad/mullvadvpn/lib/ui/component/AnimatedNotificationBanner.kt +++ b/android/lib/ui/component/src/main/kotlin/net/mullvad/mullvadvpn/lib/ui/component/AnimatedNotificationBanner.kt @@ -80,14 +80,14 @@ fun AnimatedNotificationBanner( modifier = notificationModifier, visibleNotification.toNotificationData( isPlayBuild = isPlayBuild, - openAppListing, - onClickShowAccount, - onClickShowChangelog, - onClickShowAndroid16UpgradeInfo, - onClickDismissChangelog, - onClickDismissNewDevice, - onClickShowWireguardPortSettings, - onClickDismissAndroid16UpgradeWarning, + openAppListing = openAppListing, + onClickShowAccount = onClickShowAccount, + onClickShowChangelog = onClickShowChangelog, + onClickShowAndroid16UpgradeInfo = onClickShowAndroid16UpgradeInfo, + onClickDismissChangelog = onClickDismissChangelog, + onClickDismissNewDevice = onClickDismissNewDevice, + onClickShowWireguardPortSettings = onClickShowWireguardPortSettings, + onClickDismissAndroid16UpgradeWarning = onClickDismissAndroid16UpgradeWarning, ), ) } diff --git a/android/lib/ui/component/src/main/kotlin/net/mullvad/mullvadvpn/lib/ui/component/NotificationData.kt b/android/lib/ui/component/src/main/kotlin/net/mullvad/mullvadvpn/lib/ui/component/NotificationData.kt index 9f4c17dbd9..53c56549b1 100644 --- a/android/lib/ui/component/src/main/kotlin/net/mullvad/mullvadvpn/lib/ui/component/NotificationData.kt +++ b/android/lib/ui/component/src/main/kotlin/net/mullvad/mullvadvpn/lib/ui/component/NotificationData.kt @@ -288,6 +288,12 @@ private fun ParameterGenerationError.errorMessageId(): Int = ParameterGenerationError.NoMatchingBridgeRelay -> { R.string.no_matching_relay } + ParameterGenerationError.NoMatchingRelayExit -> { + R.string.no_matching_relay_exit + } + ParameterGenerationError.NoMatchingRelayEntry -> { + R.string.no_matching_relay_entry + } ParameterGenerationError.NoWireguardKey -> R.string.no_wireguard_key ParameterGenerationError.CustomTunnelHostResolutionError -> R.string.custom_tunnel_host_resolution_error |