Skip to content

Commit bb0801b

Browse files
authored
User Feedback followup (#4494)
* Changed logo with vector drawable * Changed FeedbackOptions from String to CharSequence * Changed User feedback User name to User username
1 parent 58769f0 commit bb0801b

File tree

11 files changed

+72
-57
lines changed

11 files changed

+72
-57
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,10 @@
2727
- Add `user.id`, `user.name` and `user.email` to log attributes ([#4486](https://github.com/getsentry/sentry-java/pull/4486))
2828
- Serialize `preContext` and `postContext` in `SentryStackFrame` ([#4482](https://github.com/getsentry/sentry-java/pull/4482))
2929

30+
### Internal
31+
32+
- User Feedback now uses SentryUser.username instead of SentryUser.name ([#4494](https://github.com/getsentry/sentry-java/pull/4494))
33+
3034
## 8.13.3
3135

3236
### Fixes

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ protected void onCreate(Bundle savedInstanceState) {
105105
if (feedbackOptions.isUseSentryUser()) {
106106
final @Nullable User user = Sentry.getCurrentScopes().getScope().getUser();
107107
if (user != null) {
108-
edtName.setText(user.getName());
108+
edtName.setText(user.getUsername());
109109
edtEmail.setText(user.getEmail());
110110
}
111111
}
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="200dp"
3+
android:height="184dp"
4+
android:viewportWidth="72"
5+
android:viewportHeight="66">
6+
<path
7+
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"
8+
android:fillColor="#362d59"/>
9+
</vector>

sentry-android-integration-tests/sentry-uitest-android/src/androidTest/java/io/sentry/uitest/android/UserFeedbackUiTest.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -439,14 +439,15 @@ class UserFeedbackUiTest : BaseUiTest() {
439439
Sentry.setUser(
440440
User().apply {
441441
name = "Test User"
442+
username = "Test UserName"
442443
email = "Test User Email"
443444
}
444445
)
445446
showDialogAndCheck {
446447
// Name and email are filled with Sentry user properties
447448
onView(withId(R.id.sentry_dialog_user_feedback_edt_name))
448449
.check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
449-
.check(matches(withText("Test User")))
450+
.check(matches(withText("Test UserName")))
450451

451452
// Even if the field is hidden
452453
onView(withId(R.id.sentry_dialog_user_feedback_edt_email))
@@ -464,6 +465,7 @@ class UserFeedbackUiTest : BaseUiTest() {
464465
Sentry.setUser(
465466
User().apply {
466467
name = "Test User"
468+
username = "Test UserName"
467469
email = "Test User Email"
468470
}
469471
)

sentry/api/sentry.api

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2976,37 +2976,37 @@ public final class io/sentry/SentryExecutorService : io/sentry/ISentryExecutorSe
29762976
public final class io/sentry/SentryFeedbackOptions {
29772977
public fun <init> ()V
29782978
public fun <init> (Lio/sentry/SentryFeedbackOptions;)V
2979-
public fun getCancelButtonLabel ()Ljava/lang/String;
2980-
public fun getEmailLabel ()Ljava/lang/String;
2981-
public fun getEmailPlaceholder ()Ljava/lang/String;
2982-
public fun getFormTitle ()Ljava/lang/String;
2983-
public fun getIsRequiredLabel ()Ljava/lang/String;
2984-
public fun getMessageLabel ()Ljava/lang/String;
2985-
public fun getMessagePlaceholder ()Ljava/lang/String;
2986-
public fun getNameLabel ()Ljava/lang/String;
2987-
public fun getNamePlaceholder ()Ljava/lang/String;
2979+
public fun getCancelButtonLabel ()Ljava/lang/CharSequence;
2980+
public fun getEmailLabel ()Ljava/lang/CharSequence;
2981+
public fun getEmailPlaceholder ()Ljava/lang/CharSequence;
2982+
public fun getFormTitle ()Ljava/lang/CharSequence;
2983+
public fun getIsRequiredLabel ()Ljava/lang/CharSequence;
2984+
public fun getMessageLabel ()Ljava/lang/CharSequence;
2985+
public fun getMessagePlaceholder ()Ljava/lang/CharSequence;
2986+
public fun getNameLabel ()Ljava/lang/CharSequence;
2987+
public fun getNamePlaceholder ()Ljava/lang/CharSequence;
29882988
public fun getOnFormClose ()Ljava/lang/Runnable;
29892989
public fun getOnFormOpen ()Ljava/lang/Runnable;
29902990
public fun getOnSubmitError ()Lio/sentry/SentryFeedbackOptions$SentryFeedbackCallback;
29912991
public fun getOnSubmitSuccess ()Lio/sentry/SentryFeedbackOptions$SentryFeedbackCallback;
2992-
public fun getSubmitButtonLabel ()Ljava/lang/String;
2993-
public fun getSuccessMessageText ()Ljava/lang/String;
2992+
public fun getSubmitButtonLabel ()Ljava/lang/CharSequence;
2993+
public fun getSuccessMessageText ()Ljava/lang/CharSequence;
29942994
public fun isEmailRequired ()Z
29952995
public fun isNameRequired ()Z
29962996
public fun isShowBranding ()Z
29972997
public fun isShowEmail ()Z
29982998
public fun isShowName ()Z
29992999
public fun isUseSentryUser ()Z
3000-
public fun setCancelButtonLabel (Ljava/lang/String;)V
3001-
public fun setEmailLabel (Ljava/lang/String;)V
3002-
public fun setEmailPlaceholder (Ljava/lang/String;)V
3000+
public fun setCancelButtonLabel (Ljava/lang/CharSequence;)V
3001+
public fun setEmailLabel (Ljava/lang/CharSequence;)V
3002+
public fun setEmailPlaceholder (Ljava/lang/CharSequence;)V
30033003
public fun setEmailRequired (Z)V
3004-
public fun setFormTitle (Ljava/lang/String;)V
3005-
public fun setIsRequiredLabel (Ljava/lang/String;)V
3006-
public fun setMessageLabel (Ljava/lang/String;)V
3007-
public fun setMessagePlaceholder (Ljava/lang/String;)V
3008-
public fun setNameLabel (Ljava/lang/String;)V
3009-
public fun setNamePlaceholder (Ljava/lang/String;)V
3004+
public fun setFormTitle (Ljava/lang/CharSequence;)V
3005+
public fun setIsRequiredLabel (Ljava/lang/CharSequence;)V
3006+
public fun setMessageLabel (Ljava/lang/CharSequence;)V
3007+
public fun setMessagePlaceholder (Ljava/lang/CharSequence;)V
3008+
public fun setNameLabel (Ljava/lang/CharSequence;)V
3009+
public fun setNamePlaceholder (Ljava/lang/CharSequence;)V
30103010
public fun setNameRequired (Z)V
30113011
public fun setOnFormClose (Ljava/lang/Runnable;)V
30123012
public fun setOnFormOpen (Ljava/lang/Runnable;)V
@@ -3015,8 +3015,8 @@ public final class io/sentry/SentryFeedbackOptions {
30153015
public fun setShowBranding (Z)V
30163016
public fun setShowEmail (Z)V
30173017
public fun setShowName (Z)V
3018-
public fun setSubmitButtonLabel (Ljava/lang/String;)V
3019-
public fun setSuccessMessageText (Ljava/lang/String;)V
3018+
public fun setSubmitButtonLabel (Ljava/lang/CharSequence;)V
3019+
public fun setSuccessMessageText (Ljava/lang/CharSequence;)V
30203020
public fun setUseSentryUser (Z)V
30213021
public fun toString ()Ljava/lang/String;
30223022
}

0 commit comments

Comments
 (0)