summaryrefslogtreecommitdiffhomepage
path: root/android/lib
diff options
context:
space:
mode:
authorAlbin <albin@mullvad.net>2023-08-04 10:23:35 +0200
committerAlbin <albin@mullvad.net>2023-08-04 11:24:45 +0200
commitbfe2a3d0d0b6ed4bbe19f580735d0cc6b3bfafd6 (patch)
tree4bbb505f1ee58ad7ae9a60dd79aeeff6430a8d1f /android/lib
parentc27e788a81832e0add9fc4ee2362df97ded96323 (diff)
downloadmullvadvpn-bfe2a3d0d0b6ed4bbe19f580735d0cc6b3bfafd6.tar.xz
mullvadvpn-bfe2a3d0d0b6ed4bbe19f580735d0cc6b3bfafd6.zip
Apply updated ktfmt formatting
Diffstat (limited to 'android/lib')
-rw-r--r--android/lib/common/src/main/kotlin/net/mullvad/mullvadvpn/lib/common/util/Intermittent.kt1
-rw-r--r--android/lib/ipc/src/main/kotlin/net/mullvad/mullvadvpn/lib/ipc/Message.kt1
-rw-r--r--android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/DeviceList.kt2
-rw-r--r--android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/GetAccountDataResult.kt3
-rw-r--r--android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/LocationConstraint.kt1
-rw-r--r--android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/RelaySettingsUpdate.kt1
-rw-r--r--android/lib/talpid/src/main/kotlin/net/mullvad/talpid/ConnectivityListener.kt1
-rw-r--r--android/lib/talpid/src/main/kotlin/net/mullvad/talpid/TalpidVpnService.kt1
8 files changed, 11 insertions, 0 deletions
diff --git a/android/lib/common/src/main/kotlin/net/mullvad/mullvadvpn/lib/common/util/Intermittent.kt b/android/lib/common/src/main/kotlin/net/mullvad/mullvadvpn/lib/common/util/Intermittent.kt
index 38b152b00a..448d96778f 100644
--- a/android/lib/common/src/main/kotlin/net/mullvad/mullvadvpn/lib/common/util/Intermittent.kt
+++ b/android/lib/common/src/main/kotlin/net/mullvad/mullvadvpn/lib/common/util/Intermittent.kt
@@ -39,6 +39,7 @@ class Intermittent<T> {
// resume execution. This allows performing any extra initialization before the value is made
// available for usage.
fun registerListener(id: Any, listener: (T?) -> Unit) = notifier.subscribe(id, listener)
+
fun unregisterListener(id: Any) = notifier.unsubscribe(id)
suspend fun await(): T {
diff --git a/android/lib/ipc/src/main/kotlin/net/mullvad/mullvadvpn/lib/ipc/Message.kt b/android/lib/ipc/src/main/kotlin/net/mullvad/mullvadvpn/lib/ipc/Message.kt
index dd5f9442e1..7cc293b373 100644
--- a/android/lib/ipc/src/main/kotlin/net/mullvad/mullvadvpn/lib/ipc/Message.kt
+++ b/android/lib/ipc/src/main/kotlin/net/mullvad/mullvadvpn/lib/ipc/Message.kt
@@ -6,6 +6,7 @@ import android.os.Parcelable
sealed class Message(private val messageId: Int) : Parcelable {
abstract class EventMessage : Message(1)
+
abstract class RequestMessage : Message(2)
protected abstract val messageKey: String
diff --git a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/DeviceList.kt b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/DeviceList.kt
index de1acb0e23..afe5982ed5 100644
--- a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/DeviceList.kt
+++ b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/DeviceList.kt
@@ -2,6 +2,8 @@ package net.mullvad.mullvadvpn.model
sealed class DeviceList {
object Unavailable : DeviceList()
+
data class Available(val devices: List<Device>) : DeviceList()
+
object Error : DeviceList()
}
diff --git a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/GetAccountDataResult.kt b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/GetAccountDataResult.kt
index cbed622df6..2e94266e2a 100644
--- a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/GetAccountDataResult.kt
+++ b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/GetAccountDataResult.kt
@@ -2,7 +2,10 @@ package net.mullvad.mullvadvpn.model
sealed class GetAccountDataResult {
class Ok(val accountData: AccountData) : GetAccountDataResult()
+
object InvalidAccount : GetAccountDataResult()
+
object RpcError : GetAccountDataResult()
+
object OtherError : GetAccountDataResult()
}
diff --git a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/LocationConstraint.kt b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/LocationConstraint.kt
index de7dd4e99b..0c9d331e3b 100644
--- a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/LocationConstraint.kt
+++ b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/LocationConstraint.kt
@@ -6,5 +6,6 @@ import kotlinx.parcelize.Parcelize
sealed class LocationConstraint : Parcelable {
@Parcelize
data class Location(val location: GeographicLocationConstraint) : LocationConstraint()
+
@Parcelize data class CustomList(val listId: String) : LocationConstraint()
}
diff --git a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/RelaySettingsUpdate.kt b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/RelaySettingsUpdate.kt
index 85f5de2a32..a7d4c0b03d 100644
--- a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/RelaySettingsUpdate.kt
+++ b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/RelaySettingsUpdate.kt
@@ -2,5 +2,6 @@ package net.mullvad.mullvadvpn.model
sealed class RelaySettingsUpdate {
object CustomTunnelEndpoint : RelaySettingsUpdate()
+
data class Normal(var constraints: RelayConstraintsUpdate) : RelaySettingsUpdate()
}
diff --git a/android/lib/talpid/src/main/kotlin/net/mullvad/talpid/ConnectivityListener.kt b/android/lib/talpid/src/main/kotlin/net/mullvad/talpid/ConnectivityListener.kt
index de56ebb878..cdc16567e1 100644
--- a/android/lib/talpid/src/main/kotlin/net/mullvad/talpid/ConnectivityListener.kt
+++ b/android/lib/talpid/src/main/kotlin/net/mullvad/talpid/ConnectivityListener.kt
@@ -65,5 +65,6 @@ class ConnectivityListener {
}
private external fun notifyConnectivityChange(isConnected: Boolean, senderAddress: Long)
+
private external fun destroySender(senderAddress: Long)
}
diff --git a/android/lib/talpid/src/main/kotlin/net/mullvad/talpid/TalpidVpnService.kt b/android/lib/talpid/src/main/kotlin/net/mullvad/talpid/TalpidVpnService.kt
index a94bfac428..caa8f11447 100644
--- a/android/lib/talpid/src/main/kotlin/net/mullvad/talpid/TalpidVpnService.kt
+++ b/android/lib/talpid/src/main/kotlin/net/mullvad/talpid/TalpidVpnService.kt
@@ -146,5 +146,6 @@ open class TalpidVpnService : VpnService() {
}
private external fun defaultTunConfig(): TunConfig
+
private external fun waitForTunnelUp(tunFd: Int, isIpv6Enabled: Boolean)
}