diff options
| -rw-r--r-- | mullvad-jni/src/daemon_interface.rs | 3 | ||||
| -rw-r--r-- | mullvad-jni/src/into_java.rs | 2 | ||||
| -rw-r--r-- | mullvad-jni/src/lib.rs | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/mullvad-jni/src/daemon_interface.rs b/mullvad-jni/src/daemon_interface.rs index f80c645bb6..69d16d4034 100644 --- a/mullvad-jni/src/daemon_interface.rs +++ b/mullvad-jni/src/daemon_interface.rs @@ -8,10 +8,9 @@ use mullvad_types::{ settings::Settings, states::{TargetState, TunnelState}, version::AppVersionInfo, - wireguard::KeygenEvent, + wireguard::{self, KeygenEvent}, }; use parking_lot::Mutex; -use talpid_types::net::wireguard; #[derive(Debug, err_derive::Error)] pub enum Error { diff --git a/mullvad-jni/src/into_java.rs b/mullvad-jni/src/into_java.rs index b927014178..28a45c3630 100644 --- a/mullvad-jni/src/into_java.rs +++ b/mullvad-jni/src/into_java.rs @@ -546,7 +546,7 @@ impl<'env> IntoJava<'env> for KeygenEvent { match self { KeygenEvent::NewKey(public_key) => { let class = get_class("net/mullvad/mullvadvpn/model/KeygenEvent$NewKey"); - let java_public_key = env.auto_local(public_key.into_java(env)); + let java_public_key = env.auto_local(public_key.key.into_java(env)); let parameters = [ JValue::Object(java_public_key.as_obj()), diff --git a/mullvad-jni/src/lib.rs b/mullvad-jni/src/lib.rs index c8d267bb8b..91da16f484 100644 --- a/mullvad-jni/src/lib.rs +++ b/mullvad-jni/src/lib.rs @@ -428,7 +428,7 @@ pub extern "system" fn Java_net_mullvad_mullvadvpn_MullvadDaemon_getWireguardKey _: JObject<'this>, ) -> JObject<'env> { match DAEMON_INTERFACE.get_wireguard_key() { - Ok(public_key) => public_key.into_java(&env), + Ok(key) => key.map(|k| k.key).into_java(&env), Err(error) => { log::error!( "{}", |