fix(logsender): remove dependency on :logger

Author: itsaky

logsender-sample/build.gradle.kts

@@ -33,6 +33,7 @@ android {
 
 dependencies {
 
+  implementation(projects.logger)
   implementation(projects.logsender)
 
   implementation(libs.androidx.appcompat)

logsender/build.gradle.kts

@@ -40,16 +40,13 @@ android {
     targetCompatibility = JavaVersion.VERSION_1_8
   }
 
-  @Suppress("UnstableApiUsage")
   buildFeatures.apply {
     aidl = true
     viewBinding = false
   }
 }
 
 dependencies {
-  api(projects.logger)
-
   testImplementation(libs.tests.junit)
   testImplementation(libs.tests.robolectric)
   testImplementation(libs.tests.google.truth)

logsender/src/main/java/com/itsaky/androidide/logsender/utils/Logger.java

@@ -17,8 +17,12 @@
 
 package com.itsaky.androidide.logsender.utils;
 
-import java.util.Arrays;
-import org.slf4j.LoggerFactory;
+import android.util.Log;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.StringTokenizer;
 
 /**
  * Static methods for logging messages.
@@ -27,73 +31,109 @@
  */
 public class Logger {
 
-  private static final org.slf4j.Logger LOG = LoggerFactory.getLogger(Logger.class);
+  private static final String TAG = "LogSender";
+  private static final String LINE_SEP = System.getProperty("line.separator");
 
-  public static void error(Object... messages) {
+  private static String getFormattedMessage(Object... messages) {
     if (messages == null || messages.length == 0) {
-      return;
+      return "";
     }
     if (messages.length == 1) {
-      LOG.error(String.valueOf(messages[0]));
-      return;
+      return String.valueOf(messages[0]);
     }
 
-    if (messages.length == 2) {
-      LOG.error(String.valueOf(messages[0]), messages[1]);
-      return;
+    final StringBuilder sb = new StringBuilder();
+    for (int i = 0; i < messages.length; i++) {
+      sb.append(messages[i] instanceof Throwable ? getFullStackTrace(((Throwable) messages[i]))
+          : String.valueOf(messages[i]));
+      if (i < messages.length - 1) {
+        sb.append(" ");
+      }
     }
-
-    LOG.error(String.valueOf(messages[0]), Arrays.copyOfRange(messages, 1, messages.length));
+    return sb.toString();
   }
 
-  public static void warn(Object... messages) {
-    if (messages == null || messages.length == 0) {
-      return;
+  public static String getFullStackTrace(Throwable throwable) {
+    final List<Throwable> throwableList = new ArrayList<>();
+    while (throwable != null && !throwableList.contains(throwable)) {
+      throwableList.add(throwable);
+      throwable = throwable.getCause();
     }
-    if (messages.length == 1) {
-      LOG.warn(String.valueOf(messages[0]));
-      return;
+    final int size = throwableList.size();
+    final List<String> frames = new ArrayList<>();
+    List<String> nextTrace = getStackFrameList(throwableList.get(size - 1));
+    for (int i = size; --i >= 0; ) {
+      final List<String> trace = nextTrace;
+      if (i != 0) {
+        nextTrace = getStackFrameList(throwableList.get(i - 1));
+        removeCommonFrames(trace, nextTrace);
+      }
+      if (i == size - 1) {
+        frames.add(throwableList.get(i).toString());
+      } else {
+        frames.add(" Caused by: " + throwableList.get(i).toString());
+      }
+      frames.addAll(trace);
     }
-
-    if (messages.length == 2) {
-      LOG.warn(String.valueOf(messages[0]), messages[1]);
-      return;
+    StringBuilder sb = new StringBuilder();
+    for (final String element : frames) {
+      sb.append(element).append(LINE_SEP);
     }
-
-    LOG.warn(String.valueOf(messages[0]), Arrays.copyOfRange(messages, 1, messages.length));
+    return sb.toString();
   }
 
-  public static void info(Object... messages) {
-    if (messages == null || messages.length == 0) {
-      return;
-    }
-    if (messages.length == 1) {
-      LOG.info(String.valueOf(messages[0]));
-      return;
+  private static List<String> getStackFrameList(final Throwable throwable) {
+    final StringWriter sw = new StringWriter();
+    final PrintWriter pw = new PrintWriter(sw, true);
+    throwable.printStackTrace(pw);
+    final String stackTrace = sw.toString();
+    final StringTokenizer frames = new StringTokenizer(stackTrace, LINE_SEP);
+    final List<String> list = new ArrayList<>();
+    boolean traceStarted = false;
+    while (frames.hasMoreTokens()) {
+      final String token = frames.nextToken();
+      // Determine if the line starts with <whitespace>at
+      final int at = token.indexOf("at");
+      if (at != -1 && token.substring(0, at).trim().isEmpty()) {
+        traceStarted = true;
+        list.add(token);
+      } else if (traceStarted) {
+        break;
+      }
     }
+    return list;
+  }
 
-    if (messages.length == 2) {
-      LOG.info(String.valueOf(messages[0]), messages[1]);
-      return;
+  private static void removeCommonFrames(
+      final List<String> causeFrames, final List<String> wrapperFrames) {
+    int causeFrameIndex = causeFrames.size() - 1;
+    int wrapperFrameIndex = wrapperFrames.size() - 1;
+    while (causeFrameIndex >= 0 && wrapperFrameIndex >= 0) {
+      // Remove the frame from the cause trace if it is the same
+      // as in the wrapper trace
+      final String causeFrame = causeFrames.get(causeFrameIndex);
+      final String wrapperFrame = wrapperFrames.get(wrapperFrameIndex);
+      if (causeFrame.equals(wrapperFrame)) {
+        causeFrames.remove(causeFrameIndex);
+      }
+      causeFrameIndex--;
+      wrapperFrameIndex--;
     }
+  }
 
-    LOG.info(String.valueOf(messages[0]), Arrays.copyOfRange(messages, 1, messages.length));
+  public static void error(Object... messages) {
+    Log.e(TAG, getFormattedMessage(messages));
   }
 
-  public static void debug(Object... messages) {
-    if (messages == null || messages.length == 0) {
-      return;
-    }
-    if (messages.length == 1) {
-      LOG.debug(String.valueOf(messages[0]));
-      return;
-    }
+  public static void warn(Object... messages) {
+    Log.w(TAG, getFormattedMessage(messages));
+  }
 
-    if (messages.length == 2) {
-      LOG.debug(String.valueOf(messages[0]), messages[1]);
-      return;
-    }
+  public static void info(Object... messages) {
+    Log.i(TAG, getFormattedMessage(messages));
+  }
 
-    LOG.debug(String.valueOf(messages[0]), Arrays.copyOfRange(messages, 1, messages.length));
+  public static void debug(Object... messages) {
+    Log.d(TAG, getFormattedMessage(messages));
   }
 }