summaryrefslogtreecommitdiffhomepage
path: root/android/service/src
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/service/src
parentc27e788a81832e0add9fc4ee2362df97ded96323 (diff)
downloadmullvadvpn-bfe2a3d0d0b6ed4bbe19f580735d0cc6b3bfafd6.tar.xz
mullvadvpn-bfe2a3d0d0b6ed4bbe19f580735d0cc6b3bfafd6.zip
Apply updated ktfmt formatting
Diffstat (limited to 'android/service/src')
-rw-r--r--android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/DaemonInstance.kt1
-rw-r--r--android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/ForegroundNotificationManager.kt2
-rw-r--r--android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadDaemon.kt21
-rw-r--r--android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/AccountCache.kt2
-rw-r--r--android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/CustomDns.kt3
-rw-r--r--android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/ServiceEndpoint.kt1
-rw-r--r--android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/SettingsListener.kt4
7 files changed, 34 insertions, 0 deletions
diff --git a/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/DaemonInstance.kt b/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/DaemonInstance.kt
index 4e121bc693..236cdeb84a 100644
--- a/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/DaemonInstance.kt
+++ b/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/DaemonInstance.kt
@@ -16,6 +16,7 @@ import net.mullvad.mullvadvpn.lib.endpoint.ApiEndpointConfiguration
class DaemonInstance(private val vpnService: MullvadVpnService) {
sealed class Command {
data class Start(val apiEndpointConfiguration: ApiEndpointConfiguration) : Command()
+
object Stop : Command()
}
diff --git a/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/ForegroundNotificationManager.kt b/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/ForegroundNotificationManager.kt
index 36d640c719..eacd2d4bc9 100644
--- a/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/ForegroundNotificationManager.kt
+++ b/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/ForegroundNotificationManager.kt
@@ -23,7 +23,9 @@ class ForegroundNotificationManager(
) {
private sealed class UpdaterMessage {
class UpdateNotification : UpdaterMessage()
+
class UpdateAction : UpdaterMessage()
+
class NewTunnelState(val newState: TunnelState) : UpdaterMessage()
}
diff --git a/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadDaemon.kt b/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadDaemon.kt
index 089e13ef31..6fa03978f7 100644
--- a/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadDaemon.kt
+++ b/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadDaemon.kt
@@ -204,36 +204,52 @@ class MullvadDaemon(
private external fun deinitialize()
private external fun connect(daemonInterfaceAddress: Long)
+
private external fun createNewAccount(daemonInterfaceAddress: Long): String?
+
private external fun disconnect(daemonInterfaceAddress: Long)
+
private external fun getAccountData(
daemonInterfaceAddress: Long,
accountToken: String
): GetAccountDataResult
private external fun getAccountHistory(daemonInterfaceAddress: Long): String?
+
private external fun getWwwAuthToken(daemonInterfaceAddress: Long): String?
+
private external fun getCurrentLocation(daemonInterfaceAddress: Long): GeoIpLocation?
+
private external fun getCurrentVersion(daemonInterfaceAddress: Long): String?
+
private external fun getRelayLocations(daemonInterfaceAddress: Long): RelayList?
+
private external fun getSettings(daemonInterfaceAddress: Long): Settings?
+
private external fun getState(daemonInterfaceAddress: Long): TunnelState?
+
private external fun getVersionInfo(daemonInterfaceAddress: Long): AppVersionInfo?
+
private external fun reconnect(daemonInterfaceAddress: Long)
+
private external fun clearAccountHistory(daemonInterfaceAddress: Long)
+
private external fun loginAccount(
daemonInterfaceAddress: Long,
accountToken: String?
): LoginResult
private external fun logoutAccount(daemonInterfaceAddress: Long)
+
private external fun listDevices(
daemonInterfaceAddress: Long,
accountToken: String?
): List<Device>?
private external fun getDevice(daemonInterfaceAddress: Long): DeviceState
+
private external fun updateDevice(daemonInterfaceAddress: Long)
+
private external fun removeDevice(
daemonInterfaceAddress: Long,
accountToken: String?,
@@ -241,10 +257,15 @@ class MullvadDaemon(
): RemoveDeviceResult
private external fun setAllowLan(daemonInterfaceAddress: Long, allowLan: Boolean)
+
private external fun setAutoConnect(daemonInterfaceAddress: Long, alwaysOn: Boolean)
+
private external fun setDnsOptions(daemonInterfaceAddress: Long, dnsOptions: DnsOptions)
+
private external fun setWireguardMtu(daemonInterfaceAddress: Long, wireguardMtu: Int?)
+
private external fun shutdown(daemonInterfaceAddress: Long)
+
private external fun submitVoucher(
daemonInterfaceAddress: Long,
voucher: String
diff --git a/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/AccountCache.kt b/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/AccountCache.kt
index ad8b96f9a5..d6ba237f97 100644
--- a/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/AccountCache.kt
+++ b/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/AccountCache.kt
@@ -20,7 +20,9 @@ class AccountCache(private val endpoint: ServiceEndpoint) {
companion object {
private sealed class Command {
object CreateAccount : Command()
+
data class Login(val account: String) : Command()
+
object Logout : Command()
}
}
diff --git a/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/CustomDns.kt b/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/CustomDns.kt
index fe8f55a66d..7ecfe02d58 100644
--- a/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/CustomDns.kt
+++ b/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/CustomDns.kt
@@ -16,9 +16,12 @@ import net.mullvad.mullvadvpn.model.DnsState
class CustomDns(private val endpoint: ServiceEndpoint) {
private sealed class Command {
@Deprecated("Use SetDnsOptions") class AddDnsServer(val server: InetAddress) : Command()
+
@Deprecated("Use SetDnsOptions") class RemoveDnsServer(val server: InetAddress) : Command()
+
@Deprecated("Use SetDnsOptions")
class ReplaceDnsServer(val oldServer: InetAddress, val newServer: InetAddress) : Command()
+
@Deprecated("Use SetDnsOptions") class SetEnabled(val enabled: Boolean) : Command()
class SetDnsOptions(val dnsOptions: DnsOptions) : Command()
diff --git a/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/ServiceEndpoint.kt b/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/ServiceEndpoint.kt
index 1d6cb9f9a7..e9aa8d4328 100644
--- a/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/ServiceEndpoint.kt
+++ b/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/ServiceEndpoint.kt
@@ -30,6 +30,7 @@ class ServiceEndpoint(
companion object {
sealed class Command {
data class RegisterListener(val listener: Messenger) : Command()
+
data class UnregisterListener(val listenerId: Int) : Command()
}
}
diff --git a/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/SettingsListener.kt b/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/SettingsListener.kt
index 2863594cb9..874b78cab3 100644
--- a/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/SettingsListener.kt
+++ b/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/SettingsListener.kt
@@ -15,9 +15,13 @@ import net.mullvad.talpid.util.EventNotifier
class SettingsListener(endpoint: ServiceEndpoint) {
private sealed class Command {
class SetAllowLan(val allow: Boolean) : Command()
+
class SetAutoConnect(val autoConnect: Boolean) : Command()
+
class SetWireGuardMtu(val mtu: Int?) : Command()
+
class SetObfuscationSettings(val settings: ObfuscationSettings?) : Command()
+
class SetQuantumResistant(val quantumResistant: QuantumResistantState) : Command()
}