Merge branch 'add-setting-for-udp2tcp-port-droid-249'

1 files changed, 23 insertions, 1 deletions

diff --git a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/Port.kt b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/Port.kt
index bcb5a8dd99..5ce44d0565 100644
--- a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/Port.kt
+++ b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/Port.kt
@@ -1,6 +1,28 @@
 package net.mullvad.mullvadvpn.lib.model
 
 import android.os.Parcelable
+import arrow.core.Either
+import arrow.core.raise.either
+import arrow.core.raise.ensure
 import kotlinx.parcelize.Parcelize
 
-@JvmInline @Parcelize value class Port(val value: Int) : Parcelable
+@JvmInline
+@Parcelize
+value class Port(val value: Int) : Parcelable {
+    companion object {
+        fun fromString(value: String): Either<ParsePortError, Port> = either {
+            val number = value.toIntOrNull() ?: raise(ParsePortError.NotANumber(value))
+            ensure(number in MIN_VALUE..MAX_VALUE) { ParsePortError.OutOfRange(number) }
+            Port(number)
+        }
+
+        private const val MIN_VALUE = 0
+        private const val MAX_VALUE = 65535
+    }
+}
+
+sealed interface ParsePortError {
+    data class NotANumber(val input: String) : ParsePortError
+
+    data class OutOfRange(val value: Int) : ParsePortError
+}