Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,19 @@ internal class DeviceInfoModule(reactContext: ReactApplicationContext) :
windowDisplayMetrics.setTo(reactApplicationContext.resources.displayMetrics)

val activity = reactApplicationContext.currentActivity ?: return windowDisplayMetrics
val bounds = WindowMetricsCalculator.getOrCreate().computeCurrentWindowMetrics(activity).bounds
val bounds =
try {
WindowMetricsCalculator.getOrCreate().computeCurrentWindowMetrics(activity).bounds
} catch (error: NoSuchMethodError) {
ReactSoftExceptionLogger.logSoftException(
NAME,
ReactNoCrashSoftException(
"WindowMetrics API is unavailable; falling back to resource display metrics.",
error,
),
)
return windowDisplayMetrics
}

if (isEdgeToEdgeFeatureFlagOn) {
windowDisplayMetrics.widthPixels = bounds.width()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,26 @@ class DeviceInfoModuleTest : TestCase() {
}
}

@Test
fun getWindowDisplayMetrics_fallsBackWhenWindowMetricsApiIsMissing() {
val activity = mock<Activity>()
doReturn(activity).whenever(reactContext).currentActivity

val calculator = mock<WindowMetricsCalculator>()
whenever(calculator.computeCurrentWindowMetrics(activity))
.thenThrow(NoSuchMethodError("WindowMetrics.getDensity()"))

withWindowMetricsCalculator(calculator) {
val resourceMetrics = reactContext.resources.displayMetrics
val metrics = deviceInfoModule.getWindowDisplayMetrics()

assertThat(metrics.widthPixels).isEqualTo(resourceMetrics.widthPixels)
assertThat(metrics.heightPixels).isEqualTo(resourceMetrics.heightPixels)
assertThat(metrics.density).isEqualTo(resourceMetrics.density)
assertThat(metrics.densityDpi).isEqualTo(resourceMetrics.densityDpi)
}
}

private fun givenDisplayMetricsHolderContains(fakeDisplayMetrics: WritableMap?) {
doReturn(fakeDisplayMetrics).whenever(deviceInfoModule).getDisplayMetricsWritableMap()
}
Expand Down
Loading