From 4e822c6fe2a4588c9fba9e888173823d5f6fd199 Mon Sep 17 00:00:00 2001 From: M66B Date: Tue, 12 Dec 2023 14:09:21 +0100 Subject: [PATCH] Refactoring --- app/src/main/java/eu/faircode/email/Log.java | 3 ++- .../main/java/eu/faircode/email/ThrowableWrapper.java | 10 ++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/Log.java b/app/src/main/java/eu/faircode/email/Log.java index b015dcbcac..fa5a76b82d 100644 --- a/app/src/main/java/eu/faircode/email/Log.java +++ b/app/src/main/java/eu/faircode/email/Log.java @@ -298,7 +298,8 @@ public class Log { public static int e(String msg) { if (BuildConfig.BETA_RELEASE) try { - Throwable ex = new ThrowableWrapper(msg); // TODO CASA + ThrowableWrapper ex = new ThrowableWrapper(); + ex.setMessage(msg); List ss = new ArrayList<>(Arrays.asList(ex.getStackTrace())); ss.remove(0); ex.setStackTrace(ss.toArray(new StackTraceElement[0])); diff --git a/app/src/main/java/eu/faircode/email/ThrowableWrapper.java b/app/src/main/java/eu/faircode/email/ThrowableWrapper.java index 9e52798311..a011226330 100644 --- a/app/src/main/java/eu/faircode/email/ThrowableWrapper.java +++ b/app/src/main/java/eu/faircode/email/ThrowableWrapper.java @@ -25,8 +25,8 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; public class ThrowableWrapper extends Throwable { + private String msg; private final Throwable ex; - private final String msg; public static native String jni_get_safe_message(Throwable ex); @@ -38,14 +38,16 @@ public class ThrowableWrapper extends Throwable { System.loadLibrary("fairemail"); } - ThrowableWrapper(String msg) { + ThrowableWrapper() { this.ex = new Throwable(); - this.msg = msg; } ThrowableWrapper(Throwable ex) { this.ex = ex; - this.msg = null; + } + + void setMessage(String msg) { + this.msg = msg; } public String getSafeMessage() {