Allow configurable list of base package names and avoid adding root cause if there already was a meaningful stacktrace

Author: Mikel Pascual

src/main/java/com/akaita/java/rxjava2debug/ExceptionUtils.java

@@ -17,13 +17,14 @@
 package com.akaita.java.rxjava2debug;
 
 import io.reactivex.annotations.NonNull;
+import io.reactivex.annotations.Nullable;
 
 import java.util.LinkedList;
 import java.util.List;
 
 class ExceptionUtils {
 
-    static Throwable setRootCause(@NonNull Throwable throwable, @NonNull Throwable rootCause) {
+    static Throwable setRootCause(@NonNull Throwable throwable, @NonNull Throwable rootCause, @Nullable String[] basePackages) {
         if (throwable == null){
             return null;
         }
@@ -32,8 +33,13 @@ static Throwable setRootCause(@NonNull Throwable throwable, @NonNull Throwable r
         }
 
         List<Throwable> causes = listCauses(throwable);
-        causes.add(rootCause);
-        return collapseCauses(causes);
+        if (basePackages != null
+                && StackTraceUtils.anyContains(causes, basePackages)) {
+            return throwable;
+        } else {
+            causes.add(rootCause);
+            return collapseCauses(causes);
+        }
     }
 
     private static @NonNull

src/main/java/com/akaita/java/rxjava2debug/RxJava2Debug.java

@@ -18,18 +18,26 @@
 
 import hu.akarnokd.rxjava2.debug.RxJavaAssemblyException;
 import hu.akarnokd.rxjava2.debug.RxJavaAssemblyTracking;
+import io.reactivex.annotations.NonNull;
+import io.reactivex.annotations.Nullable;
+
+import java.util.List;
 
 import static com.akaita.java.rxjava2debug.ExceptionUtils.setRootCause;
 import static com.akaita.java.rxjava2debug.StackTraceUtils.parseStackTrace;
 
 public class RxJava2Debug {
-    private static String BASE_APP_PACKAGE_NAME = "com.akaita.fgas";
+    private @Nullable
+    static String[] basePackages;
 
     /**
      * Enable a system to collect information about RxJava's execution to provide a more meaningful StackTrace in case of crash<br/>
      * <b>Beware:</b> Any crash-reporting handler should be set up <i>before</i> calling this method
+     * @param basePackageNames List of base package names of your code, so the created stacktrace will have one of those on its top<br/>
+     *                         <i>null</i> to disable any filtering
      */
-    public static void enableRxJava2AssemblyTracking() {
+    public static void enableRxJava2AssemblyTracking(@Nullable String[] basePackageNames) {
+        basePackages = basePackageNames;
         RxJavaAssemblyTracking.enable();
         setRxJavaAssemblyHandler();
     }
@@ -54,10 +62,10 @@ public void uncaughtException(Thread t, Throwable e) {
 
                 RxJavaAssemblyException assembledException = RxJavaAssemblyException.find(e);
                 if (assembledException != null) {
-                    StackTraceElement[] clearStack = parseStackTrace(assembledException, BASE_APP_PACKAGE_NAME);
+                    StackTraceElement[] clearStack = parseStackTrace(assembledException, basePackages);
                     Throwable clearException = new Throwable();
                     clearException.setStackTrace(clearStack);
-                    toThrow = setRootCause(e, clearException);
+                    toThrow = setRootCause(e, clearException, basePackages);
                 }
 
                 previousDefaultHandler.uncaughtException(t, toThrow);

src/main/java/com/akaita/java/rxjava2debug/StackTraceUtils.java

@@ -37,15 +37,17 @@ class StackTraceUtils {
      * @return StackTrace, filtered so a app-specific line is at the top of it
      */
     @NonNull
-    static StackTraceElement[] parseStackTrace(@NonNull RxJavaAssemblyException exception, @NonNull String basePackageName) {
+    static StackTraceElement[] parseStackTrace(@NonNull RxJavaAssemblyException exception, @Nullable String[] basePackages) {
         String[] lines = exception.stacktrace()
                 .split(NEW_LINE_REGEX);
 
         List<StackTraceElement> stackTrace = new ArrayList<StackTraceElement>();
-        boolean appSpecificFound = false;
+        boolean filterIn = false;
         for (String line : lines) {
-            appSpecificFound = appSpecificFound || line.contains(basePackageName);
-            if (appSpecificFound) {
+            filterIn = filterIn
+                    || basePackages == null
+                    || startsWithAny(line, basePackages);
+            if (filterIn) {
                 StackTraceElement element = parseStackTraceLine(line);
                 if (element != null) {
                     stackTrace.add(element);
@@ -56,6 +58,25 @@ static StackTraceElement[] parseStackTrace(@NonNull RxJavaAssemblyException exce
         return stackTrace.toArray(new StackTraceElement[0]);
     }
 
+    static boolean startsWithAny(@NonNull String input, @NonNull String[] matchers) {
+        for (String matcher :
+                matchers) {
+            if (input.startsWith("at "+matcher) || input.startsWith(matcher)) return true;
+        }
+        return false;
+    }
+
+    static boolean anyContains(List<Throwable> causes, @NonNull String[] basePackages) {
+        for (Throwable cause : causes) {
+            StackTraceElement[] stackTrace = cause.getStackTrace();
+            for (StackTraceElement element : stackTrace) {
+                if (startsWithAny(element.getClassName(), basePackages)) return true;
+            }
+        }
+
+        return false;
+    }
+
     /**
      * Parse string containing a <i>single line</i> of a StackTrace
      *