From 2b00772111829568e483b8ba7240e05f755cbf58 Mon Sep 17 00:00:00 2001 From: M66B Date: Fri, 15 Dec 2023 10:09:21 +0100 Subject: [PATCH] Cleanup --- .../eu/faircode/email/ThrowableWrapper.java | 37 ++----------------- 1 file changed, 3 insertions(+), 34 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/ThrowableWrapper.java b/app/src/main/java/eu/faircode/email/ThrowableWrapper.java index 246b9c078a..e8af090724 100644 --- a/app/src/main/java/eu/faircode/email/ThrowableWrapper.java +++ b/app/src/main/java/eu/faircode/email/ThrowableWrapper.java @@ -33,9 +33,9 @@ public class ThrowableWrapper extends Throwable { private String msg; private final Throwable ex; - public static native String jni_get_safe_message(Throwable ex); + public static native String jni_get_safe_message(Throwable ex); // TODO CASA - public static native String jni_get_safe_stack_trace_string(Throwable ex); + public static native String jni_get_safe_stack_trace_string(Throwable ex); // TODO CASA static { System.loadLibrary("fairemail"); @@ -67,38 +67,7 @@ public class ThrowableWrapper extends Throwable { } public String getSafeStackTraceString() { - StringBuilder sb = new StringBuilder(); - - StackTraceElement[] stack = ex.getStackTrace(); - for (StackTraceElement traceElement : stack) - sb.append("\tat ").append(traceElement).append('\n'); - - Throwable cause = ex.getCause(); - StackTraceElement[] enclosing = stack; - while (cause != null) { - sb.append("Caused by: ").append('\n'); - - stack = cause.getStackTrace(); - - int m = stack.length - 1; - int n = enclosing.length - 1; - while (m >= 0 && n >= 0 && stack[m].equals(enclosing[n])) { - m--; - n--; - } - - int common = stack.length - 1 - m; - - for (int i = 0; i <= m; i++) - sb.append("\tat ").append(stack[i]).append('\n'); - if (common != 0) - sb.append("\t... ").append(common).append(" more").append('\n'); - - enclosing = stack; - cause = cause.getCause(); - } - - return sb.toString(); //jni_get_safe_stack_trace_string(ex); + return jni_get_safe_stack_trace_string(ex); } public String toSafeString() {