Add entry and exit no relay errors

The old no relay error is still kept for single hop

2 files changed, 5 insertions, 7 deletions

diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/usecase/inappnotification/TunnelStateNotificationUseCase.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/usecase/inappnotification/TunnelStateNotificationUseCase.kt
index 8e58c58a36..442e562bac 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/usecase/inappnotification/TunnelStateNotificationUseCase.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/usecase/inappnotification/TunnelStateNotificationUseCase.kt
@@ -76,9 +76,11 @@ class TunnelStateNotificationUseCase(
         } else this
 
     private fun ErrorState.isPossiblePortError(): Boolean =
-        cause is ErrorStateCause.TunnelParameterError &&
-            (cause as ErrorStateCause.TunnelParameterError).error ==
-                ParameterGenerationError.NoMatchingRelay
+        (cause as? ErrorStateCause.TunnelParameterError)?.error?.let {
+            it == ParameterGenerationError.NoMatchingRelayEntry ||
+                it == ParameterGenerationError.NoMatchingRelayExit ||
+                it == ParameterGenerationError.NoMatchingRelay
+        } ?: false
 
     private fun Constraint<Port>.invalidPortOrNull(availablePortRanges: List<PortRange>): Port? =
         getOrNull()?.takeIf { !it.inAnyOf(availablePortRanges) }
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/ConnectViewModel.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/ConnectViewModel.kt
index f4c460d880..d10feff8ca 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/ConnectViewModel.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/ConnectViewModel.kt
@@ -246,8 +246,4 @@ class ConnectViewModel(
             data class PermissionDenied(val systemVpnSettingsAvailable: Boolean) : ConnectError
         }
     }
-
-    companion object {
-        const val UI_STATE_DEBOUNCE_DURATION_MILLIS: Long = 200
-    }
 }