Merge pull request orhanobut#9 from ccunniff/master

fix for stack index offset

Author: orhanobut

logger/src/main/java/com/orhanobut/logger/Logger.java

@@ -32,6 +32,11 @@ public final class Logger {
      */
     private static final int MAX_METHOD_COUNT = 5;
 
+    /**
+     * The minimum stack trace index, starts at this class after two native calls.
+     */
+    private static final int MIN_STACK_OFFSET = 3;
+
     /**
      * It is used to determine log settings such as method count, thread info visibility
      */
@@ -120,7 +125,7 @@ public static void e(String tag, Exception e) {
 
     public static void e(String message, int methodCount) {
         validateMethodCount(methodCount);
-        e(message, null, methodCount);
+        e(TAG, message, methodCount);
     }
 
     public static void e(String tag, String message, int methodCount) {
@@ -303,8 +308,11 @@ private static void logHeaderContent(int logType, String tag, int methodCount) {
             logDivider(logType, tag);
         }
         String level = "";
+
+        int stackOffset = getStackOffset(trace);
+
         for (int i = methodCount; i > 0; i--) {
-            int stackIndex = i + 5;
+            int stackIndex = i + stackOffset;
             StringBuilder builder = new StringBuilder();
             builder.append("║ ")
                     .append(level)
@@ -407,5 +415,20 @@ public Settings setLogLevel(LogLevel logLevel) {
         }
     }
 
+    /**
+     * Determines the starting index of the stack trace, after method calls made by this class.
+     *
+     * @param trace the stack trace
+     * @return  the stack offset
+     */
+    private static int getStackOffset(StackTraceElement[] trace) {
+        for (int i = MIN_STACK_OFFSET; i < trace.length; i++) {
+            StackTraceElement e = trace[i];
+            if (!e.getClassName().equals(Logger.class.getName())) {
+                return --i;
+            }
+        }
+        return -1;
+    }
 
 }