Implement `MullvadDaemon::disconnect`

2 files changed, 14 insertions, 0 deletions

diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/MullvadDaemon.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/MullvadDaemon.kt
index 4c640c9e04..e95a761ba5 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/MullvadDaemon.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/MullvadDaemon.kt
@@ -12,6 +12,7 @@ class MullvadDaemon {
     }
 
     external fun connect()
+    external fun disconnect()
     external fun getAccountData(accountToken: String): AccountData?
     external fun getRelayLocations(): RelayList
     external fun getSettings(): Settings
diff --git a/mullvad-jni/src/lib.rs b/mullvad-jni/src/lib.rs
index 4f261f8c51..d5708c9a0a 100644
--- a/mullvad-jni/src/lib.rs
+++ b/mullvad-jni/src/lib.rs
@@ -173,6 +173,19 @@ pub extern "system" fn Java_net_mullvad_mullvadvpn_MullvadDaemon_connect(_: JNIE
 
 #[no_mangle]
 #[allow(non_snake_case)]
+pub extern "system" fn Java_net_mullvad_mullvadvpn_MullvadDaemon_disconnect(_: JNIEnv, _: JObject) {
+    let daemon = DAEMON_INTERFACE.lock();
+
+    if let Err(error) = daemon.disconnect() {
+        log::error!(
+            "{}",
+            error.display_chain_with_msg("Failed to request daemon to disconnect")
+        );
+    }
+}
+
+#[no_mangle]
+#[allow(non_snake_case)]
 pub extern "system" fn Java_net_mullvad_mullvadvpn_MullvadDaemon_getAccountData<'env, 'this>(
     env: JNIEnv<'env>,
     _: JObject<'this>,