diff options
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/MullvadDaemon.kt | 1 | ||||
| -rw-r--r-- | mullvad-jni/src/lib.rs | 18 |
2 files changed, 19 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 e88355c274..9de3dc12d7 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/MullvadDaemon.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/MullvadDaemon.kt @@ -25,6 +25,7 @@ class MullvadDaemon(val vpnService: MullvadVpnService) { external fun generateWireguardKey(): KeygenEvent? external fun getAccountData(accountToken: String): AccountData? external fun getCurrentLocation(): GeoIpLocation? + external fun getCurrentVersion(): String external fun getRelayLocations(): RelayList external fun getSettings(): Settings external fun getState(): TunnelState diff --git a/mullvad-jni/src/lib.rs b/mullvad-jni/src/lib.rs index 5dec981e5e..7b56831ee7 100644 --- a/mullvad-jni/src/lib.rs +++ b/mullvad-jni/src/lib.rs @@ -300,6 +300,24 @@ pub extern "system" fn Java_net_mullvad_mullvadvpn_MullvadDaemon_getCurrentLocat #[no_mangle] #[allow(non_snake_case)] +pub extern "system" fn Java_net_mullvad_mullvadvpn_MullvadDaemon_getCurrentVersion<'env, 'this>( + env: JNIEnv<'env>, + _: JObject<'this>, +) -> JString<'env> { + match DAEMON_INTERFACE.get_current_version() { + Ok(location) => location.into_java(&env), + Err(error) => { + log::error!( + "{}", + error.display_chain_with_msg("Failed to get current version") + ); + String::new().into_java(&env) + } + } +} + +#[no_mangle] +#[allow(non_snake_case)] pub extern "system" fn Java_net_mullvad_mullvadvpn_MullvadDaemon_getRelayLocations<'env, 'this>( env: JNIEnv<'env>, _: JObject<'this>, |