#138: Use result instead of unwrapping from_java_cesu8

Author: astonbitecode

rust/src/errors.rs

@@ -21,6 +21,7 @@ use std::sync::mpsc::RecvError;
 use std::sync::{PoisonError, TryLockError};
 use std::{fmt, result};
 
+use cesu8::Cesu8DecodingError;
 use fs_extra;
 use serde_json;
 
@@ -136,3 +137,9 @@ impl From<Canceled> for J4RsError {
         J4RsError::RustError(format!("{:?}", err))
     }
 }
+
+impl From<Cesu8DecodingError> for J4RsError {
+    fn from(err: Cesu8DecodingError) -> J4RsError {
+        J4RsError::ParseError(format!("{:?}", err))
+    }
+}

rust/src/jni_utils.rs

@@ -533,7 +533,7 @@ pub(crate) unsafe fn string_from_jobject(
     } else {
         let s = (opt_to_res(cache::get_jni_get_string_utf_chars())?)(jni_env, obj, ptr::null_mut())
             as *mut c_char;
-        let rust_string = utils::to_rust_string(s);
+        let rust_string = utils::to_rust_string(s)?;
 
         Ok(rust_string)
     }
@@ -545,7 +545,7 @@ pub unsafe fn jstring_to_rust_string(jvm: &Jvm, java_string: jstring) -> errors:
         java_string,
         ptr::null_mut(),
     ) as *mut c_char;
-    let rust_string = utils::to_rust_string(s);
+    let rust_string = utils::to_rust_string(s)?;
     (opt_to_res(cache::get_jni_release_string_utf_chars())?)(jvm.jni_env, java_string, s);
     Jvm::do_return(jvm.jni_env, rust_string)
 }

rust/src/utils.rs

@@ -26,9 +26,9 @@ use crate::api::{
 };
 use crate::{cache, errors, InvocationArg, JavaClass};
 
-pub fn to_rust_string(pointer: *const c_char) -> String {
+pub fn to_rust_string(pointer: *const c_char) -> errors::Result<String> {
     let slice = unsafe { CStr::from_ptr(pointer).to_bytes() };
-    from_java_cesu8(slice).unwrap().to_string()
+    Ok(from_java_cesu8(slice)?.to_string())
 }
 
 pub fn to_c_string(string: &str) -> *mut c_char {