Skip to content

Commit 5fedd17

Browse files
romtsnromtsn
authored
Merge 3eeb978 into 52feca7 
2 parents 52feca7 + 3eeb978 commit 5fedd17

20 files changed

Lines changed: 560 additions & 387 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22

33
## Unreleased
44

5+
### Deprecations
6+
7+
- Rename `SentryUserFeedbackDialog` to `SentryUserFeedbackForm` and `Sentry.showUserFeedbackDialog()` to `Sentry.showUserFeedbackForm()` ([#5349](https://github.com/getsentry/sentry-java/pull/5349))
8+
- The old `SentryUserFeedbackDialog` class and `Sentry.showUserFeedbackDialog()` methods are deprecated but still work and will be removed in the next major version
9+
510
### Dependencies
611

712
- Bump Native SDK from v0.13.7 to v0.13.8 ([#5334](https://github.com/getsentry/sentry-java/pull/5334))

‎sentry-android-core/api/sentry-android-core.api‎

Lines changed: 27 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -496,23 +496,44 @@ public class io/sentry/android/core/SentryUserFeedbackButton : android/widget/Bu
496496
public fun setOnClickListener (Landroid/view/View$OnClickListener;)V
497497
}
498498

499-
public final class io/sentry/android/core/SentryUserFeedbackDialog : android/app/AlertDialog {
500-
public fun setCancelable (Z)V
501-
public fun setOnDismissListener (Landroid/content/DialogInterface$OnDismissListener;)V
502-
public fun show ()V
499+
public final class io/sentry/android/core/SentryUserFeedbackDialog : io/sentry/android/core/SentryUserFeedbackForm {
503500
}
504501

505-
public class io/sentry/android/core/SentryUserFeedbackDialog$Builder {
502+
public class io/sentry/android/core/SentryUserFeedbackDialog$Builder : io/sentry/android/core/SentryUserFeedbackForm$Builder {
506503
public fun <init> (Landroid/content/Context;)V
507504
public fun <init> (Landroid/content/Context;I)V
508505
public fun <init> (Landroid/content/Context;ILio/sentry/android/core/SentryUserFeedbackDialog$OptionsConfiguration;)V
509506
public fun <init> (Landroid/content/Context;Lio/sentry/android/core/SentryUserFeedbackDialog$OptionsConfiguration;)V
510507
public fun associatedEventId (Lio/sentry/protocol/SentryId;)Lio/sentry/android/core/SentryUserFeedbackDialog$Builder;
508+
public synthetic fun associatedEventId (Lio/sentry/protocol/SentryId;)Lio/sentry/android/core/SentryUserFeedbackForm$Builder;
511509
public fun configurator (Lio/sentry/SentryFeedbackOptions$OptionsConfigurator;)Lio/sentry/android/core/SentryUserFeedbackDialog$Builder;
510+
public synthetic fun configurator (Lio/sentry/SentryFeedbackOptions$OptionsConfigurator;)Lio/sentry/android/core/SentryUserFeedbackForm$Builder;
512511
public fun create ()Lio/sentry/android/core/SentryUserFeedbackDialog;
512+
public synthetic fun create ()Lio/sentry/android/core/SentryUserFeedbackForm;
513+
}
514+
515+
public abstract interface class io/sentry/android/core/SentryUserFeedbackDialog$OptionsConfiguration : io/sentry/android/core/SentryUserFeedbackForm$OptionsConfiguration {
516+
}
517+
518+
public class io/sentry/android/core/SentryUserFeedbackForm : android/app/AlertDialog {
519+
protected fun onCreate (Landroid/os/Bundle;)V
520+
protected fun onStart ()V
521+
public fun setCancelable (Z)V
522+
public fun setOnDismissListener (Landroid/content/DialogInterface$OnDismissListener;)V
523+
public fun show ()V
524+
}
525+
526+
public class io/sentry/android/core/SentryUserFeedbackForm$Builder {
527+
public fun <init> (Landroid/content/Context;)V
528+
public fun <init> (Landroid/content/Context;I)V
529+
public fun <init> (Landroid/content/Context;ILio/sentry/android/core/SentryUserFeedbackForm$OptionsConfiguration;)V
530+
public fun <init> (Landroid/content/Context;Lio/sentry/android/core/SentryUserFeedbackForm$OptionsConfiguration;)V
531+
public fun associatedEventId (Lio/sentry/protocol/SentryId;)Lio/sentry/android/core/SentryUserFeedbackForm$Builder;
532+
public fun configurator (Lio/sentry/SentryFeedbackOptions$OptionsConfigurator;)Lio/sentry/android/core/SentryUserFeedbackForm$Builder;
533+
public fun create ()Lio/sentry/android/core/SentryUserFeedbackForm;
513534
}
514535

515-
public abstract interface class io/sentry/android/core/SentryUserFeedbackDialog$OptionsConfiguration {
536+
public abstract interface class io/sentry/android/core/SentryUserFeedbackForm$OptionsConfiguration {
516537
public abstract fun configure (Landroid/content/Context;Lio/sentry/SentryFeedbackOptions;)V
517538
}
518539

‎sentry-android-core/src/main/java/io/sentry/android/core/AndroidOptionsInitializer.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -441,7 +441,7 @@ static void installDefaultIntegrations(
441441
}
442442
options
443443
.getFeedbackOptions()
444-
.setDialogHandler(new SentryAndroidOptions.AndroidUserFeedbackIDialogHandler());
444+
.setFormHandler(new SentryAndroidOptions.AndroidUserFeedbackFormHandler());
445445
}
446446

447447
/**

‎sentry-android-core/src/main/java/io/sentry/android/core/FeedbackShakeIntegration.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ private void startShakeDetection(final @NotNull Activity activity) {
178178
}
179179
previousOnFormClose = null;
180180
});
181-
new SentryUserFeedbackDialog.Builder(active).create().show();
181+
new SentryUserFeedbackForm.Builder(active).create().show();
182182
} catch (Throwable e) {
183183
isDialogShowing = false;
184184
options.getFeedbackOptions().setOnFormClose(previousOnFormClose);

‎sentry-android-core/src/main/java/io/sentry/android/core/SentryAndroidOptions.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -741,9 +741,9 @@ public void setEnableAnrFingerprinting(final boolean enableAnrFingerprinting) {
741741
this.enableAnrFingerprinting = enableAnrFingerprinting;
742742
}
743743

744-
static class AndroidUserFeedbackIDialogHandler implements SentryFeedbackOptions.IDialogHandler {
744+
static class AndroidUserFeedbackFormHandler implements SentryFeedbackOptions.IFormHandler {
745745
@Override
746-
public void showDialog(
746+
public void showForm(
747747
final @Nullable SentryId associatedEventId,
748748
final @Nullable SentryFeedbackOptions.OptionsConfigurator configurator) {
749749
final @Nullable Activity activity = CurrentActivityHolder.getInstance().getActivity();
@@ -758,7 +758,7 @@ public void showDialog(
758758
return;
759759
}
760760

761-
new SentryUserFeedbackDialog.Builder(activity)
761+
new SentryUserFeedbackForm.Builder(activity)
762762
.associatedEventId(associatedEventId)
763763
.configurator(configurator)
764764
.create()

‎sentry-android-core/src/main/java/io/sentry/android/core/SentryUserFeedbackButton.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ private void init(
104104
}
105105
}
106106

107-
// Set the default ClickListener to open the SentryUserFeedbackDialog
107+
// Set the default ClickListener to open the SentryUserFeedbackForm
108108
setOnClickListener(delegate);
109109
}
110110

@@ -113,7 +113,7 @@ public void setOnClickListener(final @Nullable OnClickListener listener) {
113113
delegate = listener;
114114
super.setOnClickListener(
115115
v -> {
116-
new SentryUserFeedbackDialog.Builder(getContext()).create().show();
116+
new SentryUserFeedbackForm.Builder(getContext()).create().show();
117117
if (delegate != null) {
118118
delegate.onClick(v);
119119
}

0 commit comments

Comments
 (0)