diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-05-23 13:17:43 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-05-23 13:17:43 +0000 |
| commit | 7713538755fd6698634b126738cdb8953c8eb59e (patch) | |
| tree | 979d94a7e75fc41f7e2b31284660a304eb100f98 | |
| parent | ebadd1410959ed9855392431530a2d77ab70caad (diff) | |
| download | mullvadvpn-7713538755fd6698634b126738cdb8953c8eb59e.tar.xz mullvadvpn-7713538755fd6698634b126738cdb8953c8eb59e.zip | |
Implement `MullvadDaemon::connect`
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/MullvadDaemon.kt | 1 | ||||
| -rw-r--r-- | mullvad-jni/src/lib.rs | 13 |
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 6d084e6274..4c640c9e04 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/MullvadDaemon.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/MullvadDaemon.kt @@ -11,6 +11,7 @@ class MullvadDaemon { initialize() } + external fun connect() 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 9a7f81a0fc..4f261f8c51 100644 --- a/mullvad-jni/src/lib.rs +++ b/mullvad-jni/src/lib.rs @@ -160,6 +160,19 @@ fn get_class(name: &str) -> GlobalRef { #[no_mangle] #[allow(non_snake_case)] +pub extern "system" fn Java_net_mullvad_mullvadvpn_MullvadDaemon_connect(_: JNIEnv, _: JObject) { + let daemon = DAEMON_INTERFACE.lock(); + + if let Err(error) = daemon.connect() { + log::error!( + "{}", + error.display_chain_with_msg("Failed to request daemon to connect") + ); + } +} + +#[no_mangle] +#[allow(non_snake_case)] pub extern "system" fn Java_net_mullvad_mullvadvpn_MullvadDaemon_getAccountData<'env, 'this>( env: JNIEnv<'env>, _: JObject<'this>, |
