Add entry and exit no relay errors

The old no relay error is still kept for single hop

6 files changed, 23 insertions, 8 deletions

diff --git a/android/lib/daemon-grpc/src/main/kotlin/net/mullvad/mullvadvpn/lib/daemon/grpc/mapper/ToDomain.kt b/android/lib/daemon-grpc/src/main/kotlin/net/mullvad/mullvadvpn/lib/daemon/grpc/mapper/ToDomain.kt
index 26207c5d57..b60e2d8444 100644
--- a/android/lib/daemon-grpc/src/main/kotlin/net/mullvad/mullvadvpn/lib/daemon/grpc/mapper/ToDomain.kt
+++ b/android/lib/daemon-grpc/src/main/kotlin/net/mullvad/mullvadvpn/lib/daemon/grpc/mapper/ToDomain.kt
@@ -307,6 +307,10 @@ internal fun ManagementInterface.ErrorState.FirewallPolicyError.toDomain():
 
 internal fun ManagementInterface.ErrorState.GenerationError.toDomain(): ParameterGenerationError =
     when (this) {
+        ManagementInterface.ErrorState.GenerationError.NO_MATCHING_RELAY_ENTRY ->
+            ParameterGenerationError.NoMatchingRelayEntry
+        ManagementInterface.ErrorState.GenerationError.NO_MATCHING_RELAY_EXIT ->
+            ParameterGenerationError.NoMatchingRelayExit
         ManagementInterface.ErrorState.GenerationError.NO_MATCHING_RELAY ->
             ParameterGenerationError.NoMatchingRelay
         ManagementInterface.ErrorState.GenerationError.NO_MATCHING_BRIDGE_RELAY ->
diff --git a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/ParameterGenerationError.kt b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/ParameterGenerationError.kt
index 5683dc08b1..dd4e65a03a 100644
--- a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/ParameterGenerationError.kt
+++ b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/ParameterGenerationError.kt
@@ -1,6 +1,8 @@
 package net.mullvad.mullvadvpn.lib.model
 
 enum class ParameterGenerationError {
+    NoMatchingRelayEntry,
+    NoMatchingRelayExit,
     NoMatchingRelay,
     NoMatchingBridgeRelay,
     NoWireguardKey,
diff --git a/android/lib/resource/src/main/res/values/strings.xml b/android/lib/resource/src/main/res/values/strings.xml
index b03c4d7d36..1aac455e0c 100644
--- a/android/lib/resource/src/main/res/values/strings.xml
+++ b/android/lib/resource/src/main/res/values/strings.xml
@@ -462,4 +462,6 @@
     <string name="send_email">Send email</string>
     <string name="no_email_app_available">No email app available on the device</string>
     <string name="include_account_token_checkbox_text">This is a question about account or payments (include account information)</string>
+    <string name="no_matching_relay_entry">No entry server match your settings, try changing server or other settings.</string>
+    <string name="no_matching_relay_exit">No exit server match your settings, try changing server or other settings.</string>
 </resources>
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