Merge c8a1689 into 3565c96

getsentry · Aug 8, 2024 · 762eced · 762eced
2 parents 3565c96 + c8a1689
commit 762eced
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 5 deletions.
diff --git a/sentry-android-replay/src/main/java/io/sentry/android/replay/ScreenshotRecorder.kt b/sentry-android-replay/src/main/java/io/sentry/android/replay/ScreenshotRecorder.kt
@@ -26,6 +26,7 @@ import io.sentry.SentryReplayOptions
 import io.sentry.android.replay.util.MainLooperHandler
 import io.sentry.android.replay.util.getVisibleRects
 import io.sentry.android.replay.util.gracefullyShutdown
+import io.sentry.android.replay.util.submitSafely
 import io.sentry.android.replay.viewhierarchy.ViewHierarchyNode
 import io.sentry.android.replay.viewhierarchy.ViewHierarchyNode.ImageViewHierarchyNode
 import io.sentry.android.replay.viewhierarchy.ViewHierarchyNode.TextViewHierarchyNode
@@ -122,7 +123,7 @@ internal class ScreenshotRecorder(
  val viewHierarchy = ViewHierarchyNode.fromView(root, null, 0, options)
  root.traverse(viewHierarchy)
 
- recorder.submit {
+ recorder.submitSafely(options, "screenshot_recorder.redact") {
  val canvas = Canvas(bitmap)
  canvas.setMatrix(prescaledMatrix)
  viewHierarchy.traverse { node ->

diff --git a/...y-android-replay/src/main/java/io/sentry/android/replay/capture/SessionCaptureStrategy.kt b/...y-android-replay/src/main/java/io/sentry/android/replay/capture/SessionCaptureStrategy.kt
@@ -124,7 +124,6 @@ internal class SessionCaptureStrategy(
  }
 
  override fun onConfigurationChanged(recorderConfig: ScreenshotRecorderConfig) {
- val currentSegmentTimestamp = segmentTimestamp ?: return
  createCurrentSegment("onConfigurationChanged") { segment ->
  if (segment is ReplaySegment.Created) {
  segment.capture(hub)

diff --git a/sentry-android-replay/src/main/java/io/sentry/android/replay/util/Views.kt b/sentry-android-replay/src/main/java/io/sentry/android/replay/util/Views.kt
@@ -14,6 +14,8 @@ import android.os.Build.VERSION
 import android.os.Build.VERSION_CODES
 import android.text.Layout
 import android.view.View
+import android.widget.TextView
+import java.lang.NullPointerException
 
 /**
  * Adapted copy of AccessibilityNodeInfo from https://cs.android.com/android/platform/superproject/+/master:frameworks/base/core/java/android/view/View.java;l=10718
@@ -26,7 +28,7 @@ internal fun View.isVisibleToUser(): Pair<Boolean, Rect?> {
  }
  // An invisible predecessor or one with alpha zero means
  // that this view is not visible to the user.
- var current: Any = this
+ var current: Any? = this
  while (current is View) {
  val view = current
  val transitionAlpha = if (VERSION.SDK_INT >= VERSION_CODES.Q) view.transitionAlpha else 1f
@@ -53,7 +55,10 @@ internal fun Drawable?.isRedactable(): Boolean {
  // TODO: otherwise maybe check for the bitmap size and don't redact those that take a lot of height (e.g. a background of a whatsapp chat)
  return when (this) {
  is InsetDrawable, is ColorDrawable, is VectorDrawable, is GradientDrawable -> false
- is BitmapDrawable -> !bitmap.isRecycled && bitmap.height > 10 && bitmap.width > 10
+ is BitmapDrawable -> {
+ val bmp = bitmap ?: return false
+ return !bmp.isRecycled && bmp.height > 10 && bmp.width > 10
+ }
  else -> true
  }
 }
@@ -84,3 +89,15 @@ internal fun Layout?.getVisibleRects(globalRect: Rect, paddingLeft: Int, padding
  }
  return rects
 }
+
+/**
+ * [TextView.getVerticalOffset] which is used by [TextView.getTotalPaddingTop] may throw an NPE on
+ * some devices (Redmi), so we try-catch it specifically for an NPE and then fallback to
+ * [TextView.getExtendedPaddingTop]
+ */
+internal val TextView.totalPaddingTopSafe: Int
+ get() = try {
+ totalPaddingTop
+ } catch (e: NullPointerException) {
+ extendedPaddingTop
+ }
diff --git a/...-android-replay/src/main/java/io/sentry/android/replay/viewhierarchy/ViewHierarchyNode.kt b/...-android-replay/src/main/java/io/sentry/android/replay/viewhierarchy/ViewHierarchyNode.kt
@@ -9,6 +9,7 @@ import android.widget.TextView
 import io.sentry.SentryOptions
 import io.sentry.android.replay.util.isRedactable
 import io.sentry.android.replay.util.isVisibleToUser
+import io.sentry.android.replay.util.totalPaddingTopSafe
 
 @TargetApi(26)
 sealed class ViewHierarchyNode(
@@ -245,7 +246,7 @@ sealed class ViewHierarchyNode(
  layout = view.layout,
  dominantColor = view.currentTextColor.toOpaque(),
  paddingLeft = view.totalPaddingLeft,
- paddingTop = view.totalPaddingTop,
+ paddingTop = view.totalPaddingTopSafe,
  x = view.x,
  y = view.y,
  width = view.width,