From 48c4380a9bb7672ce44581d00d67d817f2d2d98d Mon Sep 17 00:00:00 2001 From: Thomas Nardone Date: Thu, 29 Aug 2024 11:12:08 -0700 Subject: [PATCH] ReactImageView - fix double imageSource check (#46248) Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/46248 Only null check and grab the url once. Changelog: [Internal] Reviewed By: rshest Differential Revision: D61934974 fbshipit-source-id: 2214a79b34ecc9182e88551a7b04b58d371e5e7d --- .../com/facebook/react/views/image/ReactImageView.kt | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/image/ReactImageView.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/image/ReactImageView.kt index e68fe4bd138..879f4c88f5a 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/image/ReactImageView.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/image/ReactImageView.kt @@ -481,9 +481,7 @@ public class ReactImageView( } private fun maybeUpdateViewFromRequest(doResize: Boolean) { - if (imageSource == null) { - return - } + val uri = this.imageSource?.uri ?: return val postprocessorList = mutableListOf() iterativeBoxBlurPostProcessor?.let { postprocessorList.add(it) } @@ -492,10 +490,8 @@ public class ReactImageView( val resizeOptions = if (doResize) resizeOptions else null - val imageSourceSafe = this.imageSource ?: return - val imageRequestBuilder = - ImageRequestBuilder.newBuilderWithSource(imageSourceSafe.uri) + ImageRequestBuilder.newBuilderWithSource(uri) .setPostprocessor(postprocessor) .setResizeOptions(resizeOptions) .setAutoRotateEnabled(true) @@ -504,7 +500,7 @@ public class ReactImageView( val imageRequest: ImageRequest = ReactNetworkImageRequest.fromBuilderWithHeaders(imageRequestBuilder, headers) - globalImageLoadListener?.onLoadAttempt(imageSourceSafe.uri) + globalImageLoadListener?.onLoadAttempt(uri) @Suppress("UNCHECKED_CAST") // Unsafe cast necessary as this java class used raw generics val builder =