From 28d5c15cb97ca7308878c24f97fd6fee518ba39f Mon Sep 17 00:00:00 2001 From: David Vacca Date: Sat, 22 Apr 2023 14:39:51 -0700 Subject: [PATCH] Remove lint warning on ReactInstance (#37038) Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/37038 ez diff to remove warning on ReactInstance changelog: [internal] internal Reviewed By: fkgozali Differential Revision: D45198113 fbshipit-source-id: 936d5e5d159b0e7995d1048ba6f98a0608a1af7c --- .../react/bridgeless/ReactInstance.java | 20 ++++++++----------- 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/ReactInstance.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/ReactInstance.java index bfec4055c5f..c04059a9604 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/ReactInstance.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/ReactInstance.java @@ -9,6 +9,7 @@ package com.facebook.react.bridgeless; import android.content.res.AssetManager; import android.view.View; +import androidx.annotation.NonNull; import com.facebook.common.logging.FLog; import com.facebook.infer.annotation.Nullsafe; import com.facebook.infer.annotation.ThreadConfined; @@ -175,7 +176,7 @@ final class ReactInstance { @Override public String[] getComponentNames() { Collection viewManagerNames = getViewManagerNames(); - if (viewManagerNames == null) { + if (viewManagerNames.size() < 1) { FLog.e(TAG, "No ViewManager names found"); return new String[0]; } @@ -296,11 +297,7 @@ final class ReactInstance { } public Collection getNativeModules() { - Collection nativeModules = new ArrayList<>(); - for (NativeModule module : mTurboModuleManager.getModules()) { - nativeModules.add(module); - } - return nativeModules; + return new ArrayList<>(mTurboModuleManager.getModules()); } public @Nullable T getNativeModule(Class nativeModuleInterface) { @@ -340,11 +337,10 @@ final class ReactInstance { "Starting surface without a view is not supported, use prerenderSurface instead."); } - /** - * This is a temporary mitigation for 646912b2590a6d5e760316cc064d1e27, - * - *

TODO T83828172 investigate why surface.getView() has id NOT equal to View.NO_ID - */ + /* + This is a temporary mitigation for 646912b2590a6d5e760316cc064d1e27, +

TODO T83828172 investigate why surface.getView() has id NOT equal to View.NO_ID + */ if (view.getId() != View.NO_ID) { ReactSoftExceptionLogger.logSoftException( TAG, @@ -467,7 +463,7 @@ final class ReactInstance { return null; } - private Collection getViewManagerNames() { + private @NonNull Collection getViewManagerNames() { Set uniqueNames = new HashSet<>(); if (mDelegate != null) { List packages = mDelegate.getReactPackages();