ref(feedback): Extract shared shake listener in SentryUserFeedbackForm

romtsn · claude · romtsn · commit 35ee7a51db30 · 2026-05-04T11:44:45.000+02:00
Co-Authored-By: Claude Opus 4.6 &lt;noreply@anthropic.com&gt;
diff --git a/sentry-android-core/src/main/java/io/sentry/android/core/SentryUserFeedbackForm.java b/sentry-android-core/src/main/java/io/sentry/android/core/SentryUserFeedbackForm.java
@@ -70,19 +70,7 @@ private void maybeStartShakeDetection(final @NotNull Context context) {
     final @NotNull SentryOptions options = Sentry.getCurrentScopes().getOptions();
     shakeDetector = new SentryShakeDetector(options.getLogger());
     final @NotNull WeakReference<Activity> activityRef = new WeakReference<>(activity);
-    shakeDetector.start(
-        activity,
-        () -> {
-          final @Nullable Activity active = activityRef.get();
-          if (active != null && !active.isFinishing() && !active.isDestroyed()) {
-            active.runOnUiThread(
-                () -> {
-                  if (!active.isFinishing() && !active.isDestroyed()) {
-                    show();
-                  }
-                });
-          }
-        });
+    shakeDetector.start(activity, shakeListener(activityRef));
     final @NotNull Application app = activity.getApplication();
     shakeLifecycleCallbacks = new ShakeLifecycleCallbacks(activityRef);
     app.registerActivityLifecycleCallbacks(shakeLifecycleCallbacks);
@@ -102,6 +90,21 @@ private void stopShakeDetection() {
     }
   }
 
+  private @NotNull SentryShakeDetector.Listener shakeListener(
+      final @NotNull WeakReference<Activity> activityRef) {
+    return () -> {
+      final @Nullable Activity active = activityRef.get();
+      if (active != null && !active.isFinishing() && !active.isDestroyed()) {
+        active.runOnUiThread(
+            () -> {
+              if (!active.isFinishing() && !active.isDestroyed()) {
+                show();
+              }
+            });
+      }
+    };
+  }
+
   private static @Nullable Activity getActivity(final @NotNull Context context) {
     Context current = context;
     while (current instanceof ContextWrapper) {
@@ -123,19 +126,7 @@ private class ShakeLifecycleCallbacks implements Application.ActivityLifecycleCa
     @Override
     public void onActivityResumed(final @NotNull Activity activity) {
       if (activity == activityRef.get() && shakeDetector != null) {
-        shakeDetector.start(
-            activity,
-            () -> {
-              final @Nullable Activity active = activityRef.get();
-              if (active != null && !active.isFinishing() && !active.isDestroyed()) {
-                active.runOnUiThread(
-                    () -> {
-                      if (!active.isFinishing() && !active.isDestroyed()) {
-                        show();
-                      }
-                    });
-              }
-            });
+        shakeDetector.start(activity, shakeListener(activityRef));
       }
     }
 
