extract inner inApp check into a reusable static method

Author: supervacuus

sentry-android-core/src/main/java/io/sentry/android/core/internal/tombstone/TombstoneParser.java

@@ -3,6 +3,7 @@
 import androidx.annotation.NonNull;
 import io.sentry.SentryEvent;
 import io.sentry.SentryLevel;
+import io.sentry.SentryStackTraceFactory;
 import io.sentry.android.core.internal.util.NativeEventUtils;
 import io.sentry.protocol.DebugImage;
 import io.sentry.protocol.DebugMeta;
@@ -22,6 +23,7 @@
 import java.util.Map;
 import java.util.Objects;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 public class TombstoneParser implements Closeable {
 
@@ -116,23 +118,11 @@ private SentryStackTrace createStackTrace(@NonNull final TombstoneProtos.Thread
       stackFrame.setFunction(frame.getFunctionName());
       stackFrame.setInstructionAddr(formatHex(frame.getPc()));
 
-      // TODO: is this the right order?
-      boolean inApp = false;
-      for (String inclusion : this.inAppIncludes) {
-        if (frame.getFunctionName().startsWith(inclusion)) {
-          inApp = true;
-          break;
-        }
-      }
-
-      for (String exclusion : this.inAppExcludes) {
-        if (frame.getFunctionName().startsWith(exclusion)) {
-          inApp = false;
-          break;
-        }
-      }
+      @Nullable
+      Boolean inApp =
+          SentryStackTraceFactory.isInApp(frame.getFunctionName(), inAppIncludes, inAppExcludes);
 
-      inApp = inApp || frame.getFileName().startsWith(this.nativeLibraryDir);
+      inApp = (inApp != null && inApp) || frame.getFileName().startsWith(this.nativeLibraryDir);
 
       stackFrame.setInApp(inApp);
       frames.add(0, stackFrame);

sentry/api/sentry.api

@@ -3974,6 +3974,7 @@ public final class io/sentry/SentryStackTraceFactory {
 	public fun getInAppCallStack ()Ljava/util/List;
 	public fun getStackFrames ([Ljava/lang/StackTraceElement;Z)Ljava/util/List;
 	public fun isInApp (Ljava/lang/String;)Ljava/lang/Boolean;
+	public static fun isInApp (Ljava/lang/String;Ljava/util/List;Ljava/util/List;)Ljava/lang/Boolean;
 }
 
 public final class io/sentry/SentryThreadFactory {

sentry/src/main/java/io/sentry/SentryStackTraceFactory.java

@@ -72,26 +72,29 @@ public List<SentryStackFrame> getStackFrames(
   }
 
   /**
-   * Returns if the className is InApp or not.
+   * Provides the logic to decide whether a className is part of the includes or excludes list of
+   * strings. The bias is towards includes, meaning once a className starts with a prefix in the
+   * includes list, it immediately returns, ignoring any counter entry in excludes.
    *
    * @param className the className
    * @return true if it is or false otherwise
    */
   @Nullable
-  public Boolean isInApp(final @Nullable String className) {
+  public static Boolean isInApp(
+      final @Nullable String className,
+      final @NotNull List<String> includes,
+      final @NotNull List<String> excludes) {
     if (className == null || className.isEmpty()) {
       return true;
     }
 
-    final List<String> inAppIncludes = options.getInAppIncludes();
-    for (String include : inAppIncludes) {
+    for (String include : includes) {
       if (className.startsWith(include)) {
         return true;
       }
     }
 
-    final List<String> inAppExcludes = options.getInAppExcludes();
-    for (String exclude : inAppExcludes) {
+    for (String exclude : excludes) {
       if (className.startsWith(exclude)) {
         return false;
       }
@@ -100,6 +103,17 @@ public Boolean isInApp(final @Nullable String className) {
     return null;
   }
 
+  /**
+   * Returns if the className is InApp or not.
+   *
+   * @param className the className
+   * @return true if it is or false otherwise
+   */
+  @Nullable
+  public Boolean isInApp(final @Nullable String className) {
+    return isInApp(className, options.getInAppIncludes(), options.getInAppExcludes());
+  }
+
   /**
    * Returns the call stack leading to the exception, including in-app frames and excluding sentry
    * and system frames.