Fixed #387 proguard issue with "SourceCode" and line numbers

davideas · Jun 16, 2017 · 61abe09 · 61abe09
1 parent d754fb9
commit 61abe09
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/flexible-adapter-app/src/main/java/eu/davidea/samples/flexibleadapter/MainActivity.java b/flexible-adapter-app/src/main/java/eu/davidea/samples/flexibleadapter/MainActivity.java
@@ -168,7 +168,11 @@ protected void onCreate(Bundle savedInstanceState) {
 		}
 
 		setContentView(R.layout.activity_main);
-		FlexibleAdapter.enableLogs(Level.DEBUG);
+		if (BuildConfig.DEBUG) {
+			FlexibleAdapter.enableLogs(Level.DEBUG);
+		} else {
+			FlexibleAdapter.enableLogs(Level.SUPPRESS);
+		}
 		Log.v("onCreate");
 
 		// Initialize Toolbar, Drawer & FAB

diff --git a/flexible-adapter/src/main/java/eu/davidea/flexibleadapter/utils/Log.java b/flexible-adapter/src/main/java/eu/davidea/flexibleadapter/utils/Log.java
@@ -53,7 +53,8 @@
  */
 public class Log {
 
-    private static int LEVEL;
+    private static final String SOURCE_FILE = "SourceFile";
+    private static int LEVEL = SUPPRESS;
     private static boolean withMethodName;
     private static boolean withLineNumber;
 
@@ -241,7 +242,9 @@ public static void wtf(Throwable t, String msg, Object... args) {
 
     private static String getTag() {
         StackTraceElement traceElement = new Throwable().getStackTrace()[2];
-        return traceElement.getFileName().split("[.]")[0];
+        String fileName = traceElement.getFileName();
+        if (fileName == null) return SOURCE_FILE;
+        return fileName.split("[.]")[0];
     }
 
     private static String formatMessage(String msg, Object... args) {