ref(feedback): address review feedback from lucas-zimerman

- Rename ShakeDetectionIntegration to FeedbackShakeIntegration to
  clarify its purpose is feedback-specific (#1)
- Avoid Math.sqrt by comparing squared gForce values (#3)
- Null out listener before unregistering sensor to prevent in-flight
  callbacks during stop (#4)

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Author: antonis

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

@@ -269,6 +269,19 @@ public abstract class io/sentry/android/core/EnvelopeFileObserverIntegration : i
 	public final fun register (Lio/sentry/IScopes;Lio/sentry/SentryOptions;)V
 }
 
+public final class io/sentry/android/core/FeedbackShakeIntegration : android/app/Application$ActivityLifecycleCallbacks, io/sentry/Integration, java/io/Closeable {
+	public fun <init> (Landroid/app/Application;)V
+	public fun close ()V
+	public fun onActivityCreated (Landroid/app/Activity;Landroid/os/Bundle;)V
+	public fun onActivityDestroyed (Landroid/app/Activity;)V
+	public fun onActivityPaused (Landroid/app/Activity;)V
+	public fun onActivityResumed (Landroid/app/Activity;)V
+	public fun onActivitySaveInstanceState (Landroid/app/Activity;Landroid/os/Bundle;)V
+	public fun onActivityStarted (Landroid/app/Activity;)V
+	public fun onActivityStopped (Landroid/app/Activity;)V
+	public fun register (Lio/sentry/IScopes;Lio/sentry/SentryOptions;)V
+}
+
 public abstract interface class io/sentry/android/core/IDebugImagesLoader {
 	public abstract fun clearDebugImages ()V
 	public abstract fun loadDebugImages ()Ljava/util/List;
@@ -497,19 +510,6 @@ public abstract interface class io/sentry/android/core/SentryUserFeedbackDialog$
 	public abstract fun configure (Landroid/content/Context;Lio/sentry/SentryFeedbackOptions;)V
 }
 
-public final class io/sentry/android/core/ShakeDetectionIntegration : android/app/Application$ActivityLifecycleCallbacks, io/sentry/Integration, java/io/Closeable {
-	public fun <init> (Landroid/app/Application;)V
-	public fun close ()V
-	public fun onActivityCreated (Landroid/app/Activity;Landroid/os/Bundle;)V
-	public fun onActivityDestroyed (Landroid/app/Activity;)V
-	public fun onActivityPaused (Landroid/app/Activity;)V
-	public fun onActivityResumed (Landroid/app/Activity;)V
-	public fun onActivitySaveInstanceState (Landroid/app/Activity;Landroid/os/Bundle;)V
-	public fun onActivityStarted (Landroid/app/Activity;)V
-	public fun onActivityStopped (Landroid/app/Activity;)V
-	public fun register (Lio/sentry/IScopes;Lio/sentry/SentryOptions;)V
-}
-
 public class io/sentry/android/core/SpanFrameMetricsCollector : io/sentry/IPerformanceContinuousCollector, io/sentry/android/core/internal/util/SentryFrameMetricsCollector$FrameMetricsCollectorListener {
 	protected final field lock Lio/sentry/util/AutoClosableReentrantLock;
 	public fun <init> (Lio/sentry/android/core/SentryAndroidOptions;Lio/sentry/android/core/internal/util/SentryFrameMetricsCollector;)V

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

@@ -404,7 +404,7 @@ static void installDefaultIntegrations(
               (Application) context, buildInfoProvider, activityFramesTracker));
       options.addIntegration(new ActivityBreadcrumbsIntegration((Application) context));
       options.addIntegration(new UserInteractionIntegration((Application) context, loadClass));
-      options.addIntegration(new ShakeDetectionIntegration((Application) context));
+      options.addIntegration(new FeedbackShakeIntegration((Application) context));
       if (isFragmentAvailable) {
         options.addIntegration(new FragmentLifecycleIntegration((Application) context, true, true));
       }

…roid/core/ShakeDetectionIntegration.java …droid/core/FeedbackShakeIntegration.javasentry-android-core/src/main/java/io/sentry/android/core/ShakeDetectionIntegration.java renamed to sentry-android-core/src/main/java/io/sentry/android/core/FeedbackShakeIntegration.java sentry-android-core/src/main/java/io/sentry/android/core/ShakeDetectionIntegration.java renamed to sentry-android-core/src/main/java/io/sentry/android/core/FeedbackShakeIntegration.java

@@ -19,7 +19,7 @@
  * Detects shake gestures and shows the user feedback dialog when a shake is detected. Only active
  * when {@link io.sentry.SentryFeedbackOptions#isUseShakeGesture()} returns {@code true}.
  */
-public final class ShakeDetectionIntegration
+public final class FeedbackShakeIntegration
     implements Integration, Closeable, Application.ActivityLifecycleCallbacks {
 
   private final @NotNull Application application;
@@ -30,7 +30,7 @@ public final class ShakeDetectionIntegration
   private volatile @Nullable Activity dialogActivity;
   private @Nullable Runnable originalOnFormClose;
 
-  public ShakeDetectionIntegration(final @NotNull Application application) {
+  public FeedbackShakeIntegration(final @NotNull Application application) {
     this.application = Objects.requireNonNull(application, "Application is required");
   }
 
@@ -42,10 +42,10 @@ public void register(final @NotNull IScopes scopes, final @NotNull SentryOptions
       return;
     }
 
-    addIntegrationToSdkVersion("ShakeDetection");
+    addIntegrationToSdkVersion("FeedbackShake");
     originalOnFormClose = this.options.getFeedbackOptions().getOnFormClose();
     application.registerActivityLifecycleCallbacks(this);
-    options.getLogger().log(SentryLevel.DEBUG, "ShakeDetectionIntegration installed.");
+    options.getLogger().log(SentryLevel.DEBUG, "FeedbackShakeIntegration installed.");
 
     // In case of a deferred init, hook into any already-resumed activity
     final @Nullable Activity activity = CurrentActivityHolder.getInstance().getActivity();

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

@@ -63,11 +63,11 @@ public void start(final @NotNull Context context, final @NotNull Listener shakeL
   }
 
   public void stop() {
+    listener = null;
     if (sensorManager != null) {
       sensorManager.unregisterListener(this);
       sensorManager = null;
     }
-    listener = null;
   }
 
   @Override

…id/core/ShakeDetectionIntegrationTest.kt …oid/core/FeedbackShakeIntegrationTest.ktsentry-android-core/src/test/java/io/sentry/android/core/ShakeDetectionIntegrationTest.kt renamed to sentry-android-core/src/test/java/io/sentry/android/core/FeedbackShakeIntegrationTest.kt sentry-android-core/src/test/java/io/sentry/android/core/ShakeDetectionIntegrationTest.kt renamed to sentry-android-core/src/test/java/io/sentry/android/core/FeedbackShakeIntegrationTest.kt

@@ -15,7 +15,7 @@ import org.mockito.kotlin.verify
 import org.mockito.kotlin.whenever
 
 @RunWith(AndroidJUnit4::class)
-class ShakeDetectionIntegrationTest {
+class FeedbackShakeIntegrationTest {
 
   private class Fixture {
     val application = mock<Application>()
@@ -28,9 +28,9 @@ class ShakeDetectionIntegrationTest {
       options.feedbackOptions.setDialogHandler(dialogHandler)
     }
 
-    fun getSut(useShakeGesture: Boolean = true): ShakeDetectionIntegration {
+    fun getSut(useShakeGesture: Boolean = true): FeedbackShakeIntegration {
       options.feedbackOptions.isUseShakeGesture = useShakeGesture
-      return ShakeDetectionIntegration(application)
+      return FeedbackShakeIntegration(application)
     }
   }
 

sentry-android-core/src/test/java/io/sentry/android/core/SentryAndroidTest.kt

@@ -488,7 +488,7 @@ class SentryAndroidTest {
           it is ActivityLifecycleIntegration ||
           it is ActivityBreadcrumbsIntegration ||
           it is UserInteractionIntegration ||
-          it is ShakeDetectionIntegration ||
+          it is FeedbackShakeIntegration ||
           it is FragmentLifecycleIntegration ||
           it is SentryTimberIntegration ||
           it is AppComponentsBreadcrumbsIntegration ||

sentry-samples/sentry-samples-android/src/main/java/io/sentry/samples/android/MyApplication.java

@@ -3,6 +3,7 @@
 import android.app.Application;
 import android.os.StrictMode;
 import io.sentry.Sentry;
+import io.sentry.android.core.SentryAndroid;
 
 /** Apps. main Application. */
 public class MyApplication extends Application {
@@ -13,19 +14,12 @@ public void onCreate() {
     strictMode();
     super.onCreate();
 
-    // Example how to initialize the SDK manually which allows access to SentryOptions callbacks.
-    // Make sure you disable the auto init via manifest meta-data: io.sentry.auto-init=false
-    // SentryAndroid.init(
-    //    this,
-    //    options -> {
-    //      /*
-    //      use options, for example, to add a beforeSend callback:
-    //
-    //      options.setBeforeSend((event, hint) -> {
-    //        process event
-    //      });
-    //       */
-    //    });
+    // Enable shake gesture to open feedback form (for testing)
+    SentryAndroid.init(
+        this,
+        options -> {
+          options.getFeedbackOptions().setUseShakeGesture(true);
+        });
   }
 
   private void strictMode() {