Merge branch 'main' into feat/user-feedback-button

# Conflicts:
#	CHANGELOG.md
#	sentry-android-core/api/sentry-android-core.api
#	sentry-android-core/src/main/res/layout/sentry_dialog_user_feedback.xml
#	sentry-android-integration-tests/sentry-uitest-android/src/androidTest/java/io/sentry/uitest/android/UserFeedbackUiTest.kt
#	sentry-samples/sentry-samples-android/src/main/java/io/sentry/samples/android/MainActivity.java

Author: stefanosiano

.github/workflows/codeql-analysis.yml

@@ -36,7 +36,7 @@ jobs:
           cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@60168efe1c415ce0f5521ea06d5c2062adbeed1b # pin@v2
+        uses: github/codeql-action/init@ff0a06e83cb2de871e5a09832bc6a81e7276941f # pin@v2
         with:
           languages: 'java'
 
@@ -45,4 +45,4 @@ jobs:
           ./gradlew buildForCodeQL --no-build-cache
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@60168efe1c415ce0f5521ea06d5c2062adbeed1b # pin@v2
+        uses: github/codeql-action/analyze@ff0a06e83cb2de871e5a09832bc6a81e7276941f # pin@v2

CHANGELOG.md

@@ -5,7 +5,7 @@
 ### Features
 
 - Add New User Feedback Widget ([#4450](https://github.com/getsentry/sentry-java/pull/4450))
-  - This widget is a custom button that can be used to show the user feedback form
+    - This widget is a custom button that can be used to show the user feedback form
 - Add New User Feedback form ([#4384](https://github.com/getsentry/sentry-java/pull/4384))
     - We now introduce SentryUserFeedbackDialog, which extends AlertDialog, inheriting the show() and cancel() methods, among others.
       To use it, just instantiate it and call show() on the instance (Sentry must be previously initialized).
@@ -21,6 +21,8 @@
       SentryUserFeedbackDialog.Builder(context).create().show()
       ```
 
+## 8.13.3
+
 ### Fixes
 
 - Send UI Profiling app start chunk when it finishes ([#4423](https://github.com/getsentry/sentry-java/pull/4423))
@@ -29,6 +31,7 @@
 - Session Replay: Do not capture current replay for cached events from the past ([#4474](https://github.com/getsentry/sentry-java/pull/4474))
 - Session Replay: Correctly capture Dialogs and non full-sized windows ([#4354](https://github.com/getsentry/sentry-java/pull/4354))
 - Session Replay: Fix inconsistent `segment_id` ([#4471](https://github.com/getsentry/sentry-java/pull/4471))
+- Session Replay: Fix crash on devices with the Unisoc/Spreadtrum T606 chipset ([#4477](https://github.com/getsentry/sentry-java/pull/4477))
 
 ## 8.13.2
 

build-logic/src/main/kotlin/io.sentry.javadoc.aggregate.gradle.kts

@@ -20,7 +20,7 @@ subprojects {
 
 val javadocCollection = javadocPublisher.incoming.artifactView { lenient(true) }.files
 
-tasks.register("aggregateJavadoc", AggregateJavadoc::class) {
+tasks.register("aggregateJavadocs", AggregateJavadoc::class) {
     group = "documentation"
     description = "Aggregates Javadocs from all subprojects into a single directory."
     javadocFiles.set(javadocCollection)

gradle.properties

@@ -14,7 +14,7 @@ org.gradle.workers.max=2
 android.useAndroidX=true
 
 # Release information
-versionName=8.13.2
+versionName=8.13.3
 
 # Override the SDK name on native crashes on Android
 sentryAndroidSdkName=sentry.native.android

sentry-android-core/src/main/res/drawable/sentry_edit_text_border.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@android:color/transparent" />
+    <stroke
+        android:width="1dp"
+        android:color="#FFAAAAAA" /> <!-- border color -->
+    <corners android:radius="4dp" />
+    <padding
+        android:left="8dp"
+        android:top="8dp"
+        android:right="8dp"
+        android:bottom="8dp" />
+</shape>

sentry-android-core/src/main/res/layout/sentry_dialog_user_feedback.xml

@@ -46,7 +46,7 @@
         android:layout_height="wrap_content"
         android:hint="Your Name"
         android:inputType="textPersonName"
-        android:background="@drawable/edit_text_border"
+        android:background="@drawable/sentry_edit_text_border"
         android:paddingHorizontal="8dp"
         android:layout_below="@id/sentry_dialog_user_feedback_txt_name" />
 
@@ -65,7 +65,7 @@
         android:layout_height="wrap_content"
         android:hint="your.email@example.org"
         android:inputType="textEmailAddress"
-        android:background="@drawable/edit_text_border"
+        android:background="@drawable/sentry_edit_text_border"
         android:paddingHorizontal="8dp"
         android:layout_below="@id/sentry_dialog_user_feedback_txt_email" />
 
@@ -86,7 +86,7 @@
         android:inputType="textMultiLine"
         android:gravity="top|left"
         android:hint="What's the bug? What did you expect?"
-        android:background="@drawable/edit_text_border"
+        android:background="@drawable/sentry_edit_text_border"
         android:paddingHorizontal="8dp"
         android:layout_below="@id/sentry_dialog_user_feedback_txt_description" />
 

sentry-android-replay/src/main/java/io/sentry/android/replay/util/SystemProperties.kt

@@ -0,0 +1,21 @@
+package io.sentry.android.replay.util
+
+import android.os.Build
+
+internal object SystemProperties {
+    enum class Property {
+        SOC_MODEL,
+        SOC_MANUFACTURER
+    }
+
+    fun get(key: Property, defaultValue: String = ""): String {
+        return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+            when (key) {
+                Property.SOC_MODEL -> Build.SOC_MODEL
+                Property.SOC_MANUFACTURER -> Build.SOC_MANUFACTURER
+            }
+        } else {
+            defaultValue
+        }
+    }
+}

sentry-android-replay/src/main/java/io/sentry/android/replay/video/SimpleVideoEncoder.kt

@@ -39,6 +39,7 @@ import android.os.Build
 import android.view.Surface
 import io.sentry.SentryLevel.DEBUG
 import io.sentry.SentryOptions
+import io.sentry.android.replay.util.SystemProperties
 import java.io.File
 import java.nio.ByteBuffer
 import kotlin.LazyThreadSafetyMode.NONE
@@ -155,11 +156,20 @@ internal class SimpleVideoEncoder(
     }
 
     fun encode(image: Bitmap) {
-        // it seems that Xiaomi devices have problems with hardware canvas, so we have to use
-        // lockCanvas instead https://stackoverflow.com/a/73520742
+        /** it seems that Xiaomi devices have problems with hardware canvas, so we have to use
+         * lockCanvas instead https://stackoverflow.com/a/73520742
+         * ---
+         * Same for Motorola devices.
+         * ---
+         * As for the T606, it's a Spreadtrum/Unisoc chipset and can be spread across various
+         * devices, so we have to check the SOC_MODEL property, as the manufacturer name might have
+         * changed.
+         * https://github.com/getsentry/sentry-android-gradle-plugin/issues/861#issuecomment-2867021256
+         */
         val canvas = if (
             Build.MANUFACTURER.contains("xiaomi", ignoreCase = true) ||
-            Build.MANUFACTURER.contains("motorola", ignoreCase = true)
+            Build.MANUFACTURER.contains("motorola", ignoreCase = true) ||
+            SystemProperties.get(SystemProperties.Property.SOC_MODEL).equals("T606", ignoreCase = true)
         ) {
             surface?.lockCanvas(null)
         } else {