Merge branch 'main' into feat/logs-device-and-os-attributes

Author: adinauer

CHANGELOG.md

@@ -29,6 +29,10 @@
 - Add device (`device.brand`, `device.model` and `device.family`) and OS (`os.name` and `os.version`) attributes to logs ([#4493](https://github.com/getsentry/sentry-java/pull/4493))
 - Serialize `preContext` and `postContext` in `SentryStackFrame` ([#4482](https://github.com/getsentry/sentry-java/pull/4482))
 
+### Internal
+
+- User Feedback now uses SentryUser.username instead of SentryUser.name ([#4494](https://github.com/getsentry/sentry-java/pull/4494))
+
 ## 8.13.3
 
 ### Fixes

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

@@ -105,7 +105,7 @@ protected void onCreate(Bundle savedInstanceState) {
     if (feedbackOptions.isUseSentryUser()) {
       final @Nullable User user = Sentry.getCurrentScopes().getScope().getUser();
       if (user != null) {
-        edtName.setText(user.getName());
+        edtName.setText(user.getUsername());
         edtEmail.setText(user.getEmail());
       }
     }

sentry-android-core/src/main/res/drawable-hdpi/sentry_logo_dark.webp

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="200dp"
+    android:height="184dp"
+    android:viewportWidth="72"
+    android:viewportHeight="66">
+  <path
+      android:pathData="M40,13.26a4.67,4.67 0,0 0,-8 0L25.42,24.53A32.21,32.21 0,0 1,43.17 51.19L38.55,51.19A27.68,27.68 0,0 0,23.09 28.47L17,39a15.92,15.92 0,0 1,9.23 12.17L15.62,51.17A0.76,0.76 0,0 1,15 50.06l2.94,-5a10.74,10.74 0,0 0,-3.36 -1.9l-2.91,5a4.54,4.54 0,0 0,1.69 6.24A4.66,4.66 0,0 0,15.62 55L30.15,55a19.4,19.4 0,0 0,-8 -17.31l2.31,-4A23.87,23.87 0,0 1,34.76 55L47.07,55a35.88,35.88 0,0 0,-16.41 -31.8l4.67,-8a0.77,0.77 0,0 1,1.05 -0.27c0.53,0.29 20.29,34.77 20.66,35.17a0.76,0.76 0,0 1,-0.68 1.13L51.6,51.23q0.09,1.91 0,3.81h4.78A4.59,4.59 0,0 0,61 50.43a4.49,4.49 0,0 0,-0.62 -2.28Z"
+      android:fillColor="#362d59"/>
+</vector>

sentry-android-core/src/main/res/drawable-mdpi/sentry_logo_dark.webp

@@ -439,14 +439,15 @@ class UserFeedbackUiTest : BaseUiTest() {
         Sentry.setUser(
             User().apply {
                 name = "Test User"
+                username = "Test UserName"
                 email = "Test User Email"
             }
         )
         showDialogAndCheck {
             // Name and email are filled with Sentry user properties
             onView(withId(R.id.sentry_dialog_user_feedback_edt_name))
                 .check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
-                .check(matches(withText("Test User")))
+                .check(matches(withText("Test UserName")))
 
             // Even if the field is hidden
             onView(withId(R.id.sentry_dialog_user_feedback_edt_email))
@@ -464,6 +465,7 @@ class UserFeedbackUiTest : BaseUiTest() {
         Sentry.setUser(
             User().apply {
                 name = "Test User"
+                username = "Test UserName"
                 email = "Test User Email"
             }
         )

sentry-android-core/src/main/res/drawable-xhdpi/sentry_logo_dark.webp

@@ -2978,37 +2978,37 @@ public final class io/sentry/SentryExecutorService : io/sentry/ISentryExecutorSe
 public final class io/sentry/SentryFeedbackOptions {
 	public fun <init> ()V
 	public fun <init> (Lio/sentry/SentryFeedbackOptions;)V
-	public fun getCancelButtonLabel ()Ljava/lang/String;
-	public fun getEmailLabel ()Ljava/lang/String;
-	public fun getEmailPlaceholder ()Ljava/lang/String;
-	public fun getFormTitle ()Ljava/lang/String;
-	public fun getIsRequiredLabel ()Ljava/lang/String;
-	public fun getMessageLabel ()Ljava/lang/String;
-	public fun getMessagePlaceholder ()Ljava/lang/String;
-	public fun getNameLabel ()Ljava/lang/String;
-	public fun getNamePlaceholder ()Ljava/lang/String;
+	public fun getCancelButtonLabel ()Ljava/lang/CharSequence;
+	public fun getEmailLabel ()Ljava/lang/CharSequence;
+	public fun getEmailPlaceholder ()Ljava/lang/CharSequence;
+	public fun getFormTitle ()Ljava/lang/CharSequence;
+	public fun getIsRequiredLabel ()Ljava/lang/CharSequence;
+	public fun getMessageLabel ()Ljava/lang/CharSequence;
+	public fun getMessagePlaceholder ()Ljava/lang/CharSequence;
+	public fun getNameLabel ()Ljava/lang/CharSequence;
+	public fun getNamePlaceholder ()Ljava/lang/CharSequence;
 	public fun getOnFormClose ()Ljava/lang/Runnable;
 	public fun getOnFormOpen ()Ljava/lang/Runnable;
 	public fun getOnSubmitError ()Lio/sentry/SentryFeedbackOptions$SentryFeedbackCallback;
 	public fun getOnSubmitSuccess ()Lio/sentry/SentryFeedbackOptions$SentryFeedbackCallback;
-	public fun getSubmitButtonLabel ()Ljava/lang/String;
-	public fun getSuccessMessageText ()Ljava/lang/String;
+	public fun getSubmitButtonLabel ()Ljava/lang/CharSequence;
+	public fun getSuccessMessageText ()Ljava/lang/CharSequence;
 	public fun isEmailRequired ()Z
 	public fun isNameRequired ()Z
 	public fun isShowBranding ()Z
 	public fun isShowEmail ()Z
 	public fun isShowName ()Z
 	public fun isUseSentryUser ()Z
-	public fun setCancelButtonLabel (Ljava/lang/String;)V
-	public fun setEmailLabel (Ljava/lang/String;)V
-	public fun setEmailPlaceholder (Ljava/lang/String;)V
+	public fun setCancelButtonLabel (Ljava/lang/CharSequence;)V
+	public fun setEmailLabel (Ljava/lang/CharSequence;)V
+	public fun setEmailPlaceholder (Ljava/lang/CharSequence;)V
 	public fun setEmailRequired (Z)V
-	public fun setFormTitle (Ljava/lang/String;)V
-	public fun setIsRequiredLabel (Ljava/lang/String;)V
-	public fun setMessageLabel (Ljava/lang/String;)V
-	public fun setMessagePlaceholder (Ljava/lang/String;)V
-	public fun setNameLabel (Ljava/lang/String;)V
-	public fun setNamePlaceholder (Ljava/lang/String;)V
+	public fun setFormTitle (Ljava/lang/CharSequence;)V
+	public fun setIsRequiredLabel (Ljava/lang/CharSequence;)V
+	public fun setMessageLabel (Ljava/lang/CharSequence;)V
+	public fun setMessagePlaceholder (Ljava/lang/CharSequence;)V
+	public fun setNameLabel (Ljava/lang/CharSequence;)V
+	public fun setNamePlaceholder (Ljava/lang/CharSequence;)V
 	public fun setNameRequired (Z)V
 	public fun setOnFormClose (Ljava/lang/Runnable;)V
 	public fun setOnFormOpen (Ljava/lang/Runnable;)V
@@ -3017,8 +3017,8 @@ public final class io/sentry/SentryFeedbackOptions {
 	public fun setShowBranding (Z)V
 	public fun setShowEmail (Z)V
 	public fun setShowName (Z)V
-	public fun setSubmitButtonLabel (Ljava/lang/String;)V
-	public fun setSuccessMessageText (Ljava/lang/String;)V
+	public fun setSubmitButtonLabel (Ljava/lang/CharSequence;)V
+	public fun setSuccessMessageText (Ljava/lang/CharSequence;)V
 	public fun setUseSentryUser (Z)V
 	public fun toString ()Ljava/lang/String;
 }