summaryrefslogtreecommitdiffhomepage
path: root/android/src
diff options
context:
space:
mode:
authorEmīls <pinkisemils@mullvad.net>2020-02-12 12:20:02 +0000
committerEmīls <pinkisemils@mullvad.net>2020-02-13 16:10:58 +0000
commitd38d729e518f6e23bb08266fe36cc119572ef126 (patch)
tree50367eebf2cf0feb023f6e9bdcba9fec9c289286 /android/src
parent7a75ce2d4c31db33a4419fcc45102d6e357f1a73 (diff)
downloadmullvadvpn-d38d729e518f6e23bb08266fe36cc119572ef126.tar.xz
mullvadvpn-d38d729e518f6e23bb08266fe36cc119572ef126.zip
Add setAutoConnect to mullvad-jni
Diffstat (limited to 'android/src')
-rw-r--r--android/src/main/kotlin/net/mullvad/mullvadvpn/model/Settings.kt3
-rw-r--r--android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadDaemon.kt5
2 files changed, 7 insertions, 1 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/Settings.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/model/Settings.kt
index 6cc83b157f..77a45e03a8 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/Settings.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/model/Settings.kt
@@ -3,5 +3,6 @@ package net.mullvad.mullvadvpn.model
data class Settings(
var accountToken: String?,
var relaySettings: RelaySettings,
- var allowLan: Boolean
+ var allowLan: Boolean,
+ var autoConnect: Boolean
)
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadDaemon.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadDaemon.kt
index a0dabf1a53..df608dab69 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadDaemon.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadDaemon.kt
@@ -89,6 +89,10 @@ class MullvadDaemon(val vpnService: MullvadVpnService) {
setAllowLan(daemonInterfaceAddress, allowLan)
}
+ fun setAutoConnect(autoConnect: Boolean) {
+ setAutoConnect(daemonInterfaceAddress, autoConnect)
+ }
+
fun shutdown() {
shutdown(daemonInterfaceAddress)
}
@@ -122,6 +126,7 @@ class MullvadDaemon(val vpnService: MullvadVpnService) {
private external fun getWireguardKey(daemonInterfaceAddress: Long): PublicKey?
private external fun setAccount(daemonInterfaceAddress: Long, accountToken: String?)
private external fun setAllowLan(daemonInterfaceAddress: Long, allowLan: Boolean)
+ private external fun setAutoConnect(daemonInterfaceAddress: Long, alwaysOn: Boolean)
private external fun shutdown(daemonInterfaceAddress: Long)
private external fun updateRelaySettings(
daemonInterfaceAddress: Long,