zec
/
zcash-android-wallet-sdk
mirror of https://github.com/zcash/zcash-android-wallet-sdk.git

Use failure::Error in utils::exception instead of jni::errors::Error

This commit is contained in:
Jack Grigg 2019-02-11 16:52:00 +00:00
parent 42b2076dc1
commit 25e79f042b
No known key found for this signature in database
GPG Key ID: 1B8D649257DB0829
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/rust/utils/exception.rs
View File

@ -12,13 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
use jni::{errors::Result as JniResult, JNIEnv};
use failure::Error;
use jni::JNIEnv;
use std::any::Any;
use std::error::Error;
use std::thread;
type ExceptionResult<T> = thread::Result<JniResult<T>>;
type ExceptionResult<T> = thread::Result<Result<T, Error>>;
// Returns value or "throws" exception. `error_val` is returned, because exception will be thrown
// at the Java side. So this function should be used only for the `panic::catch_unwind` result.
@ -78,7 +77,7 @@ pub fn any_to_string(any: &Box<Any + Send>) -> String {
s.to_string()
} else if let Some(s) = any.downcast_ref::<String>() {
s.clone()
} else if let Some(error) = any.downcast_ref::<Box<Error + Send>>() {
} else if let Some(error) = any.downcast_ref::<Box<std::error::Error + Send>>() {
error.description().to_string()
} else {
"Unknown error occurred".to_string()