Include `RelaySettings` in `Settings`

2 files changed, 12 insertions, 4 deletions

diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/Settings.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/model/Settings.kt
index 1254492b57..c0c2abdbe7 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/Settings.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/model/Settings.kt
@@ -1,4 +1,4 @@
 package net.mullvad.mullvadvpn.model
 
-data class Settings(var accountToken: String?) {
+data class Settings(var accountToken: String?, var relaySettings: RelaySettings) {
 }
diff --git a/mullvad-jni/src/into_java.rs b/mullvad-jni/src/into_java.rs
index 3dd65451e7..1c6733252b 100644
--- a/mullvad-jni/src/into_java.rs
+++ b/mullvad-jni/src/into_java.rs
@@ -280,9 +280,17 @@ impl<'env> IntoJava<'env> for Settings {
     fn into_java(self, env: &JNIEnv<'env>) -> Self::JavaType {
         let class = get_class("net/mullvad/mullvadvpn/model/Settings");
         let account_token = env.auto_local(JObject::from(self.get_account_token().into_java(env)));
-        let parameters = [JValue::Object(account_token.as_obj())];
+        let relay_settings = env.auto_local(self.get_relay_settings().into_java(env));
+        let parameters = [
+            JValue::Object(account_token.as_obj()),
+            JValue::Object(relay_settings.as_obj()),
+        ];
 
-        env.new_object(&class, "(Ljava/lang/String;)V", &parameters)
-            .expect("Failed to create Settings Java object")
+        env.new_object(
+            &class,
+            "(Ljava/lang/String;Lnet/mullvad/mullvadvpn/model/RelaySettings;)V",
+            &parameters,
+        )
+        .expect("Failed to create Settings Java object")
     }
 }