Fixed throwable doubles info

Author: lordtao

README.md

@@ -110,6 +110,9 @@ add to your dependencies in build.gradle
 
 Changelog
 ---------
+#### 1.4.10 -- Fixed throwable doubles info
+* Fixed throwable doubles info
+
 #### 1.4.8 -- removed annotations
 * removed annotations for backward compatibility
 

log/build.gradle

@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
 
 def versionMajor = 1
 def versionMinor = 4
-def versionPatch = 9
+def versionPatch = 10
 
 version = "${versionMajor}.${versionMinor}.${versionPatch}"
 

log/src/main/java/ua/at/tsvetkov/util/Format.java

@@ -83,6 +83,7 @@ final class Format {
    static final String NL = "\n";
    static final String ARRAY = "Array";
    public static final char SPACE = ' ';
+   public static final String AT = "at ";
 
    static volatile int maxTagLength = MAX_TAG_LENGTH;
    static volatile int beforeTagSpacesCount;
@@ -815,7 +816,9 @@ static StringBuilder getFormattedMessage(StringBuilder stringBuilder, String mes
    static StringBuilder getFormattedThrowable(String message, Throwable throwable) {
       String[] lines = null;
       if (message != null) {
-         lines = message.split("\\n");
+         lines = message.concat("\n" + getThrowableMessage(throwable)).split("\\n");
+      } else {
+         lines = getThrowableMessage(throwable).split("\\n");
       }
       int linesCount = getLinesCount(lines, throwable);
       lines = createLines(throwable, lines, linesCount);
@@ -833,6 +836,11 @@ static StringBuilder getFormattedThrowable(String message, Throwable throwable)
       return sb;
    }
 
+   @NonNull
+   private static String getThrowableMessage(Throwable throwable) {
+      return throwable.getClass().getName() + ": " + throwable.getMessage();
+   }
+
    private static int getLinesCount(String title, String[] lines) {
       int count = (lines == null) ? 0 : lines.length;
       if (Log.isLogOutlined) {
@@ -900,9 +908,9 @@ private static String[] createLines(Throwable throwable, String[] lines, int cou
             StackTraceElement[] stack = throwable.getStackTrace();
             for (int i = 0; i < stack.length; i++) {
                if (i == 0) {
-                  lns[linesCount + 1 + i] = THROWABLE_DELIMITER_START + stack[i].toString();
+                  lns[linesCount + 1 + i] = THROWABLE_DELIMITER_START + AT + stack[i].toString();
                } else {
-                  lns[linesCount + 1 + i] = THROWABLE_DELIMITER_START + THROWABLE_DELIMITER_PREFIX + stack[i].toString();
+                  lns[linesCount + 1 + i] = THROWABLE_DELIMITER_START + THROWABLE_DELIMITER_PREFIX + AT + stack[i].toString();
                }
             }
          }
@@ -965,7 +973,8 @@ static void addStackTrace(StringBuilder sb, Thread thread) {
    static void addStackTrace(StringBuilder sb, StackTraceElement[] traces) {
       for (int i = 4; i < traces.length; i++) {
          sb.append(THROWABLE_DELIMITER_PREFIX);
-         sb.append(traces[i].toString());
+         sb.append(AT);
+         sb.append( traces[i].toString());
          sb.append('\n');
       }
    }