Skip to content

ref(feedback): Extend Dialog instead of AlertDialog in SentryUserFeedbackForm #6338

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
runningcode wants to merge 2 commits into
base: 9.x.x
Choose a base branch
from
+37 −10
Open

ref(feedback): Extend Dialog instead of AlertDialog in SentryUserFeedbackForm #6338

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
df1f6df
ref(feedback): Extend Dialog instead of AlertDialog in SentryUserFeed…
runningcode Oct 21, 2026
0eb7685
changelog
runningcode Oct 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
- `Sentry.showUserFeedbackDialog(...)`: use `Sentry.feedback().show(...)` instead
- Android: `SentryUserFeedbackDialog`: use `SentryUserFeedbackForm` instead
- Android: the `SentryUserFeedbackButton` view and composable: call `Sentry.feedback().show()` from your own button instead
- `SentryUserFeedbackForm` now extends `android.app.Dialog` instead of `android.app.AlertDialog` ([#6338](https://github.com/getsentry/sentry-java/pull/6338))
- The form never used `AlertDialog` features. Code that calls `AlertDialog`-only methods on it, such as `setButton` or `setMessage`, no longer compiles.

### Fixes

Expand Down
2 changes: 1 addition & 1 deletion sentry-android-core/api/sentry-android-core.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -576,7 +576,7 @@ public abstract interface class io/sentry/android/core/SentryShakeDetector$Liste
public abstract fun onShake ()V
}

public class io/sentry/android/core/SentryUserFeedbackForm : android/app/AlertDialog {
public class io/sentry/android/core/SentryUserFeedbackForm : android/app/Dialog {
protected fun onCreate (Landroid/os/Bundle;)V
public fun onDetachedFromWindow ()V
protected fun onStart ()V
Expand Down
26 changes: 17 additions & 9 deletions sentry-android-core/src/main/java/io/sentry/android/core/SentryUserFeedbackForm.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,17 @@
package io.sentry.android.core;

import android.app.Activity;
import android.app.AlertDialog;
import android.app.Application;
import android.app.Dialog;
import android.content.ContentResolver;
import android.content.Context;
import android.content.ContextWrapper;
import android.database.Cursor;
import android.net.Uri;
import android.os.Bundle;
import android.provider.OpenableColumns;
import android.util.TypedValue;
import android.view.View;
import android.view.Window;
import android.view.WindowManager;
import android.webkit.MimeTypeMap;
import android.widget.Button;
import android.widget.EditText;
Expand All @@ -39,7 +38,7 @@
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

public class SentryUserFeedbackForm extends AlertDialog {
public class SentryUserFeedbackForm extends Dialog {

private boolean isCancelable = false;
private @Nullable SentryId currentReplayId;
Expand All @@ -60,7 +59,7 @@ public class SentryUserFeedbackForm extends AlertDialog {
final @Nullable SentryId associatedEventId,
final @Nullable OptionsConfiguration configuration,
final @Nullable SentryFeedbackOptions.OptionsConfigurator configurator) {
super(context, themeResId);
super(context, resolveTheme(context, themeResId));
this.associatedEventId = associatedEventId;
final @NotNull SentryOptions options = Sentry.getCurrentScopes().getOptions();
@NotNull
Expand Down Expand Up @@ -211,6 +210,19 @@ public void onActivitySaveInstanceState(
final @NotNull Activity activity, final @NotNull Bundle outState) {}
}

/**
* {@link Dialog} falls back to {@link android.R.attr#dialogTheme} for {@code 0}, but the form has
* always defaulted to {@link android.R.attr#alertDialogTheme}, as {@code AlertDialog} does.
*/
static int resolveTheme(final @NotNull Context context, final int themeResId) {
if (themeResId != 0) {
return themeResId;
}
final @NotNull TypedValue outValue = new TypedValue();
context.getTheme().resolveAttribute(android.R.attr.alertDialogTheme, outValue, true);
return outValue.resourceId;
}

@Override
public void setCancelable(boolean cancelable) {
super.setCancelable(cancelable);
Expand All @@ -222,10 +234,6 @@ public void setCancelable(boolean cancelable) {
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.sentry_dialog_user_feedback);
final @Nullable Window window = getWindow();

@romtsn romtsn Oct 23, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is not needed for Dialog anymore?

if (window != null) {
window.clearFlags(WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM);
}
setCancelable(isCancelable);

final @NotNull SentryFeedbackOptions feedbackOptions = resolvedFeedbackOptions;
Expand Down
17 changes: 17 additions & 0 deletions sentry-android-core/src/test/java/io/sentry/android/core/SentryUserFeedbackFormTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import android.database.Cursor
import android.net.Uri
import android.os.Looper
import android.provider.OpenableColumns
import android.view.ContextThemeWrapper
import android.view.View
import android.view.WindowManager
import android.widget.Button
Expand Down Expand Up @@ -244,6 +245,22 @@ class SentryUserFeedbackFormTest {
assertEquals(0, flags and WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM)
}

@Test
fun `default theme resolves to the context's alert dialog theme`() {
val context = ContextThemeWrapper(fixture.application, android.R.style.Theme_Material_Light)

assertThat(SentryUserFeedbackForm.resolveTheme(context, 0))
.isEqualTo(android.R.style.Theme_Material_Light_Dialog_Alert)
}

@Test
fun `explicit theme is used as is`() {
val context = ContextThemeWrapper(fixture.application, android.R.style.Theme_Material_Light)

assertThat(SentryUserFeedbackForm.resolveTheme(context, android.R.style.Theme_Material_Dialog))
.isEqualTo(android.R.style.Theme_Material_Dialog)
}

@Test
fun `a crashing onFormClose callback does not crash the app when the dialog is closed`() {
fixture.options.isEnabled = true
Expand Down
Loading