summaryrefslogtreecommitdiffhomepage
path: root/mullvad-jni/src
diff options
context:
space:
mode:
authorJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2020-11-23 20:38:04 +0000
committerJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2020-11-24 00:03:49 +0000
commitd8ff9aa58ab13f40cc69dbba673d97265c5f8a44 (patch)
tree004300c8a7ee805b6a3a9992907715adc6d38446 /mullvad-jni/src
parent2098917543c37c49c33d42fa88f664e2315df850 (diff)
downloadmullvadvpn-d8ff9aa58ab13f40cc69dbba673d97265c5f8a44.tar.xz
mullvadvpn-d8ff9aa58ab13f40cc69dbba673d97265c5f8a44.zip
Pass resource dir. when sending problem report
Diffstat (limited to 'mullvad-jni/src')
-rw-r--r--mullvad-jni/src/lib.rs12
1 files changed, 11 insertions, 1 deletions
diff --git a/mullvad-jni/src/lib.rs b/mullvad-jni/src/lib.rs
index 243bb7c65e..dd45177cdf 100644
--- a/mullvad-jni/src/lib.rs
+++ b/mullvad-jni/src/lib.rs
@@ -943,14 +943,24 @@ pub extern "system" fn Java_net_mullvad_mullvadvpn_dataproxy_MullvadProblemRepor
userEmail: JString<'_>,
userMessage: JString<'_>,
outputPath: JString<'_>,
+ resourcesDirectory: JString<'_>,
) -> jboolean {
let env = JnixEnv::from(env);
let user_email = String::from_java(&env, userEmail);
let user_message = String::from_java(&env, userMessage);
let output_path_string = String::from_java(&env, outputPath);
let output_path = Path::new(&output_path_string);
+ let resources_directory_string = String::from_java(&env, resourcesDirectory);
+ let resources_directory = Path::new(&resources_directory_string);
- match mullvad_problem_report::send_problem_report(&user_email, &user_message, output_path) {
+ let send_result = mullvad_problem_report::send_problem_report(
+ &user_email,
+ &user_message,
+ output_path,
+ resources_directory,
+ );
+
+ match send_result {
Ok(()) => JNI_TRUE,
Err(error) => {
log::error!(