updated changelog and tests

stefanosiano · stefanosiano · commit cdf2e3f2cb6c · 2025-06-17T15:35:02.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -27,6 +27,10 @@
 - Add `user.id`, `user.name` and `user.email` to log attributes ([#4486](https://github.com/getsentry/sentry-java/pull/4486))
 - 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
diff --git a/sentry-android-integration-tests/sentry-uitest-android/src/androidTest/java/io/sentry/uitest/android/UserFeedbackUiTest.kt b/sentry-android-integration-tests/sentry-uitest-android/src/androidTest/java/io/sentry/uitest/android/UserFeedbackUiTest.kt
@@ -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"
             }
         )
diff --git a/sentry/api/sentry.api b/sentry/api/sentry.api
@@ -2976,37 +2976,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
@@ -3015,8 +3015,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;
 }

Original file line number	Diff line number	Diff line change
`@@ -439,14 +439,15 @@ class UserFeedbackUiTest : BaseUiTest() {`
`439`	`439`	`Sentry.setUser(`
`440`	`440`	`User().apply {`
`441`	`441`	`name = "Test User"`
	`442`	`+ username = "Test UserName"`
`442`	`443`	`email = "Test User Email"`
`443`	`444`	`}`
`444`	`445`	`)`
`445`	`446`	`showDialogAndCheck {`
`446`	`447`	`// Name and email are filled with Sentry user properties`
`447`	`448`	`onView(withId(R.id.sentry_dialog_user_feedback_edt_name))`
`448`	`449`	`.check(matches(withEffectiveVisibility(Visibility.VISIBLE)))`
`449`		`- .check(matches(withText("Test User")))`
	`450`	`+ .check(matches(withText("Test UserName")))`
`450`	`451`
`451`	`452`	`// Even if the field is hidden`
`452`	`453`	`onView(withId(R.id.sentry_dialog_user_feedback_edt_email))`
`@@ -464,6 +465,7 @@ class UserFeedbackUiTest : BaseUiTest() {`
`464`	`465`	`Sentry.setUser(`
`465`	`466`	`User().apply {`
`466`	`467`	`name = "Test User"`
	`468`	`+ username = "Test UserName"`
`467`	`469`	`email = "Test User Email"`
`468`	`470`	`}`
`469`	`471`	`)`