Merge fc20d26 into be45a71

Author: krystofwoldrich

sentry-android-core/src/main/java/io/sentry/android/core/ScreenshotEventProcessor.java

@@ -17,6 +17,7 @@
 import io.sentry.Hint;
 import io.sentry.SentryEvent;
 import io.sentry.SentryLevel;
+import io.sentry.util.HintUtils;
 import io.sentry.util.Objects;
 import java.io.ByteArrayOutputStream;
 import java.io.Closeable;
@@ -51,10 +52,18 @@ public ScreenshotEventProcessor(
     application.registerActivityLifecycleCallbacks(this);
   }
 
+  public void setCurrentActivity(@NonNull Activity activity) {
+    if (currentActivity != null && currentActivity.get() == activity) {
+      return;
+    }
+    currentActivity = new WeakReference<>(activity);
+  }
+
   @SuppressWarnings("NullAway")
   @Override
   public @NotNull SentryEvent process(final @NotNull SentryEvent event, @NotNull Hint hint) {
-    if (!lifecycleCallbackInstalled) {
+    if (!lifecycleCallbackInstalled
+        || !HintUtils.shouldApplyScopeData(hint)) {
       return event;
     }
     if (!options.isAttachScreenshot()) {
@@ -167,13 +176,6 @@ private void cleanCurrentActivity(@NonNull Activity activity) {
     }
   }
 
-  private void setCurrentActivity(@NonNull Activity activity) {
-    if (currentActivity != null && currentActivity.get() == activity) {
-      return;
-    }
-    currentActivity = new WeakReference<>(activity);
-  }
-
   @SuppressLint("NewApi")
   private boolean isActivityValid(@Nullable Activity activity) {
     if (activity == null) {