diff --git a/CHANGELOG.md b/CHANGELOG.md index a01e88ce7c..9472ec4027 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ ### Fixes - Kotlin now sees `Attachment.getBytes()`, `Device.getArchs()`, `Spring.getActiveProfiles()` and `JsonSerializationUtils.bytesFrom(...)` as nullable, because `@Nullable` now annotates the returned array instead of its elements ([#6558](https://github.com/getsentry/sentry-java/pull/6558)) +- Shake-to-report no longer leaks the first Activity that resumes after `Sentry.init` ([#6686](https://github.com/getsentry/sentry-java/pull/6686)) ## 8.65.0 diff --git a/sentry-android-core/src/main/java/io/sentry/android/core/SentryShakeDetector.java b/sentry-android-core/src/main/java/io/sentry/android/core/SentryShakeDetector.java index 72c100923c..2861e4057f 100644 --- a/sentry-android-core/src/main/java/io/sentry/android/core/SentryShakeDetector.java +++ b/sentry-android-core/src/main/java/io/sentry/android/core/SentryShakeDetector.java @@ -76,7 +76,10 @@ private synchronized void init(final @NotNull Context context) { return; } if (sensorManager == null) { - sensorManager = (SensorManager) context.getSystemService(Context.SENSOR_SERVICE); + // An Activity's SensorManager holds on to that Activity, and the cached manager outlives it. + sensorManager = + (SensorManager) + ContextUtils.getApplicationContext(context).getSystemService(Context.SENSOR_SERVICE); } if (sensorManager != null && accelerometer == null) { accelerometer = sensorManager.getDefaultSensor(Sensor.TYPE_ACCELEROMETER, false); diff --git a/sentry-android-core/src/test/java/io/sentry/android/core/SentryShakeDetectorTest.kt b/sentry-android-core/src/test/java/io/sentry/android/core/SentryShakeDetectorTest.kt index 24ccfceaa8..267570201f 100644 --- a/sentry-android-core/src/test/java/io/sentry/android/core/SentryShakeDetectorTest.kt +++ b/sentry-android-core/src/test/java/io/sentry/android/core/SentryShakeDetectorTest.kt @@ -56,6 +56,24 @@ class SentryShakeDetectorTest { ) } + @Test + fun `resolves SensorManager from the application context`() { + val activityContext = mock() + whenever(activityContext.applicationContext).thenReturn(fixture.context) + + val sut = fixture.getSut() + sut.start(activityContext, fixture.listener) + + verify(activityContext, never()).getSystemService(any()) + verify(fixture.sensorManager) + .registerListener( + eq(sut), + eq(fixture.accelerometer), + eq(SensorManager.SENSOR_DELAY_NORMAL), + isA(), + ) + } + @Test fun `unregisters sensor listener on stop`() { val sut = fixture.getSut()