Add flag to `Relay` if it has Wireguard tunnels

2 files changed, 8 insertions, 4 deletions

diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/Relay.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/model/Relay.kt
index 85c062c4c6..4173af782b 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/Relay.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/model/Relay.kt
@@ -1,4 +1,4 @@
 package net.mullvad.mullvadvpn.model
 
-data class Relay(val hostname: String) {
+data class Relay(val hostname: String, val hasWireguardTunnels: Boolean) {
 }
diff --git a/mullvad-jni/src/into_java.rs b/mullvad-jni/src/into_java.rs
index c49ec4a2c8..470424edc0 100644
--- a/mullvad-jni/src/into_java.rs
+++ b/mullvad-jni/src/into_java.rs
@@ -3,7 +3,7 @@ use ipnetwork::IpNetwork;
 use jni::{
     objects::{JList, JObject, JString, JValue},
     signature::JavaType,
-    sys::{jint, jshort, jsize},
+    sys::{jboolean, jint, jshort, jsize},
     JNIEnv,
 };
 use mullvad_types::{
@@ -304,9 +304,13 @@ impl<'env> IntoJava<'env> for Relay {
     fn into_java(self, env: &JNIEnv<'env>) -> Self::JavaType {
         let class = get_class("net/mullvad/mullvadvpn/model/Relay");
         let hostname = env.auto_local(JObject::from(self.hostname.into_java(env)));
-        let parameters = [JValue::Object(hostname.as_obj())];
+        let has_wireguard_tunnels = (!self.tunnels.wireguard.is_empty()) as jboolean;
+        let parameters = [
+            JValue::Object(hostname.as_obj()),
+            JValue::Bool(has_wireguard_tunnels),
+        ];
 
-        env.new_object(&class, "(Ljava/lang/String;)V", &parameters)
+        env.new_object(&class, "(Ljava/lang/String;Z)V", &parameters)
             .expect("Failed to create Relay Java object")
     }
 }