Merge branch 'main' into markushi/canvas-approach

Author: markushi

.github/workflows/danger.yml

@@ -2,7 +2,7 @@ name: Danger
 
 on:
   pull_request:
-    types: [opened, synchronize, reopened, edited, ready_for_review]
+    types: [opened, synchronize, reopened, edited, ready_for_review, labeled, unlabeled]
 
 jobs:
   danger:

CHANGELOG.md

@@ -9,7 +9,7 @@
   - The attribute reflected on the log is `mdc.<key>`, where `<key>` is the original key in the MDC.
   - This means that you will be able to filter/aggregate logs in the product based on these properties.
   - Only properties with keys matching the configured `contextTags` are sent as log attributes.
-    - You can configure which properties are sent using `options.setContextTags` if initalizing manually, or by specifying a comma-separated list of keys with a `context-tags` entry in `sentry.properties` or `sentry.contex-tags` in `application.properties`.
+    - You can configure which properties are sent using `options.setContextTags` if initalizing manually, or by specifying a comma-separated list of keys with a `context-tags` entry in `sentry.properties` or `sentry.context-tags` in `application.properties`.
     - Note that keys containing spaces are not supported.
 - Add experimental Sentry Android Distribution module for integrating with Sentry Build Distribution to check for and install updates ([#4804](https://github.com/getsentry/sentry-java/pull/4804))
 - Allow passing a different `Handler` to `SystemEventsBreadcrumbsIntegration` and `AndroidConnectionStatusProvider` so their callbacks are deliver to that handler ([#4808](https://github.com/getsentry/sentry-java/pull/4808))
@@ -27,6 +27,8 @@
 - Avoid StrictMode warnings ([#4724](https://github.com/getsentry/sentry-java/pull/4724))
 - Use logger from options for JVM profiler ([#4771](https://github.com/getsentry/sentry-java/pull/4771))
 - Session Replay: Avoid deadlock when pausing replay if no connection ([#4788](https://github.com/getsentry/sentry-java/pull/4788))
+- Session Replay: Fix capturing roots with no windows ([#4805](https://github.com/getsentry/sentry-java/pull/4805))
+- Session Replay: Fix `java.lang.IllegalArgumentException: width and height must be > 0` ([#4805](https://github.com/getsentry/sentry-java/pull/4805))
 
 ### Miscellaneous
 

sentry-android-replay/src/main/java/io/sentry/android/replay/ScreenshotRecorder.kt

@@ -178,7 +178,7 @@ public data class ScreenshotRecorderConfig(
     private fun Int.adjustToBlockSize(): Int {
       val remainder = this % 16
       return if (remainder <= 8) {
-        this - remainder
+        maxOf(16, this - remainder)
       } else {
         this + (16 - remainder)
       }

sentry-android-replay/src/main/java/io/sentry/android/replay/WindowRecorder.kt

@@ -114,6 +114,11 @@ internal class WindowRecorder(
   override fun onRootViewsChanged(root: View, added: Boolean) {
     rootViewsLock.acquire().use {
       if (added) {
+        if (root.phoneWindow == null) {
+          options.logger.log(WARNING, "Root view does not have a phone window, skipping.")
+          return
+        }
+
         rootViews.add(WeakReference(root))
         capturer?.recorder?.bind(root)
         determineWindowSize(root)