From d47e5ec10cd08effd0db2d9af4e99a1c3b390ddd Mon Sep 17 00:00:00 2001 From: M66B Date: Thu, 14 Dec 2023 18:35:04 +0100 Subject: [PATCH] Simplification --- .../main/java/eu/faircode/email/ThrowableWrapper.java | 6 +++--- app/src/main/jni/fairemail.cc | 9 --------- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/ThrowableWrapper.java b/app/src/main/java/eu/faircode/email/ThrowableWrapper.java index 755a4336d7..8f92393951 100644 --- a/app/src/main/java/eu/faircode/email/ThrowableWrapper.java +++ b/app/src/main/java/eu/faircode/email/ThrowableWrapper.java @@ -35,8 +35,6 @@ public class ThrowableWrapper extends Throwable { public static native String jni_get_safe_message(Throwable ex); - public static native String jni_to_safe_string(Throwable ex); - public static native String jni_get_safe_stack_trace_string(Throwable ex); static { @@ -73,7 +71,9 @@ public class ThrowableWrapper extends Throwable { } public String toSafeString() { - return jni_to_safe_string(ex); + String name = ex.getClass().getName(); + String message = getSafeMessage(); + return (message == null ? name : (name + ": " + message)); } @Nullable diff --git a/app/src/main/jni/fairemail.cc b/app/src/main/jni/fairemail.cc index 53ffd2f383..9215876fde 100644 --- a/app/src/main/jni/fairemail.cc +++ b/app/src/main/jni/fairemail.cc @@ -32,15 +32,6 @@ Java_eu_faircode_email_ThrowableWrapper_jni_1get_1safe_1message( return (jstring) env->CallObjectMethod(ex, mid); } -extern "C" -JNIEXPORT jstring JNICALL -Java_eu_faircode_email_ThrowableWrapper_jni_1to_1safe_1string( - JNIEnv *env, jclass clazz, jthrowable ex) { - jclass cls = env->FindClass("java/lang/Throwable"); - jmethodID mid = env->GetMethodID(cls, "toString", "()Ljava/lang/String;"); - return (jstring) env->CallObjectMethod(ex, mid); -} - extern "C" JNIEXPORT jstring JNICALL Java_eu_faircode_email_ThrowableWrapper_jni_1get_1safe_1stack_1trace_1string(