From 43ad2c0abb7f3f028797bb80fdd6126d3f657169 Mon Sep 17 00:00:00 2001 From: Christoph Purrer Date: Wed, 3 Sep 2025 15:39:45 -0700 Subject: [PATCH] Remove contextContainer !=. nullptr check in ImageFetcher (#53574) Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/53574 Changelog: [Internal] This field is always non nullptr Reviewed By: javache Differential Revision: D81556283 fbshipit-source-id: d75b9cf9730f47c3d2d1ef028c2e738eda3dd785 --- .../renderer/imagemanager/ImageFetcher.cpp | 26 +++++++------------ 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/packages/react-native/ReactCommon/react/renderer/imagemanager/platform/android/react/renderer/imagemanager/ImageFetcher.cpp b/packages/react-native/ReactCommon/react/renderer/imagemanager/platform/android/react/renderer/imagemanager/ImageFetcher.cpp index 01e2983223d..0152c4872e3 100644 --- a/packages/react-native/ReactCommon/react/renderer/imagemanager/platform/android/react/renderer/imagemanager/ImageFetcher.cpp +++ b/packages/react-native/ReactCommon/react/renderer/imagemanager/platform/android/react/renderer/imagemanager/ImageFetcher.cpp @@ -16,26 +16,20 @@ namespace facebook::react { ImageFetcher::ImageFetcher( std::shared_ptr contextContainer) : contextContainer_(std::move(contextContainer)) { - if (contextContainer_ != nullptr) { - if (auto uiManagerCommitHookManager = - contextContainer_ - ->find>( - std::string(UIManagerCommitHookManagerKey)); - uiManagerCommitHookManager.has_value()) { - (*uiManagerCommitHookManager)->registerCommitHook(*this); - } + if (auto uiManagerCommitHookManager = + contextContainer_->find>( + std::string(UIManagerCommitHookManagerKey)); + uiManagerCommitHookManager.has_value()) { + (*uiManagerCommitHookManager)->registerCommitHook(*this); } } ImageFetcher::~ImageFetcher() { - if (contextContainer_ != nullptr) { - if (auto uiManagerCommitHookManager = - contextContainer_ - ->find>( - std::string(UIManagerCommitHookManagerKey)); - uiManagerCommitHookManager.has_value()) { - (*uiManagerCommitHookManager)->unregisterCommitHook(*this); - } + if (auto uiManagerCommitHookManager = + contextContainer_->find>( + std::string(UIManagerCommitHookManagerKey)); + uiManagerCommitHookManager.has_value()) { + (*uiManagerCommitHookManager)->unregisterCommitHook(*this); } }