diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/MemoryPressureRouter.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/MemoryPressureRouter.java index a29f876b6c6..75777adb036 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/MemoryPressureRouter.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/MemoryPressureRouter.java @@ -18,7 +18,7 @@ import java.util.Set; /** Translates and routes memory pressure events to the current catalyst instance. */ public class MemoryPressureRouter implements ComponentCallbacks2 { private final Set mListeners = - Collections.synchronizedSet(new LinkedHashSet()); + Collections.synchronizedSet(new LinkedHashSet<>()); public MemoryPressureRouter(Context context) { context.getApplicationContext().registerComponentCallbacks(this); diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/NativeModuleRegistryBuilder.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/NativeModuleRegistryBuilder.java index e270b8fbf66..cf85a64935b 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/NativeModuleRegistryBuilder.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/NativeModuleRegistryBuilder.java @@ -17,14 +17,12 @@ import java.util.Map; public class NativeModuleRegistryBuilder { private final ReactApplicationContext mReactApplicationContext; - private final ReactInstanceManager mReactInstanceManager; private final Map mModules = new HashMap<>(); public NativeModuleRegistryBuilder( ReactApplicationContext reactApplicationContext, ReactInstanceManager reactInstanceManager) { mReactApplicationContext = reactApplicationContext; - mReactInstanceManager = reactInstanceManager; } public void processPackage(ReactPackage reactPackage) { diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactActivity.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactActivity.java index 28b259596e5..d9346e6b9ad 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactActivity.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactActivity.java @@ -16,6 +16,7 @@ import androidx.appcompat.app.AppCompatActivity; import com.facebook.react.modules.core.DefaultHardwareBackBtnHandler; import com.facebook.react.modules.core.PermissionAwareActivity; import com.facebook.react.modules.core.PermissionListener; +import org.jetbrains.annotations.NotNull; /** Base Activity for React Native applications. */ public abstract class ReactActivity extends AppCompatActivity @@ -112,7 +113,7 @@ public abstract class ReactActivity extends AppCompatActivity @Override public void onRequestPermissionsResult( - int requestCode, String[] permissions, int[] grantResults) { + int requestCode, @NotNull String[] permissions, @NotNull int[] grantResults) { mDelegate.onRequestPermissionsResult(requestCode, permissions, grantResults); } @@ -123,7 +124,7 @@ public abstract class ReactActivity extends AppCompatActivity } @Override - public void onConfigurationChanged(Configuration newConfig) { + public void onConfigurationChanged(@NotNull Configuration newConfig) { super.onConfigurationChanged(newConfig); mDelegate.onConfigurationChanged(newConfig); } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactActivityDelegate.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactActivityDelegate.java index d8b50239125..9df5a6800f7 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactActivityDelegate.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactActivityDelegate.java @@ -34,12 +34,13 @@ public class ReactActivityDelegate { private ReactDelegate mReactDelegate; @Deprecated - public ReactActivityDelegate(Activity activity, @Nullable String mainComponentName) { + public ReactActivityDelegate(@Nullable Activity activity, @Nullable String mainComponentName) { mActivity = activity; mMainComponentName = mainComponentName; } - public ReactActivityDelegate(ReactActivity activity, @Nullable String mainComponentName) { + public ReactActivityDelegate( + @Nullable ReactActivity activity, @Nullable String mainComponentName) { mActivity = activity; mMainComponentName = mainComponentName; } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/shell/MainPackageConfig.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/shell/MainPackageConfig.java index fb71a6b4b4a..8d6b4ea3584 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/shell/MainPackageConfig.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/shell/MainPackageConfig.java @@ -12,7 +12,7 @@ import com.facebook.imagepipeline.core.ImagePipelineConfig; /** Configuration for {@link MainReactPackage} */ public class MainPackageConfig { - private ImagePipelineConfig mFrescoConfig; + private final ImagePipelineConfig mFrescoConfig; private MainPackageConfig(Builder builder) { mFrescoConfig = builder.mFrescoConfig; diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/util/ReactFindViewUtil.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/util/ReactFindViewUtil.java index 18312c37107..3b5d448815f 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/util/ReactFindViewUtil.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/util/ReactFindViewUtil.java @@ -115,12 +115,11 @@ public class ReactFindViewUtil { Iterator iterator = mOnViewFoundListeners.iterator(); while (iterator.hasNext()) { OnViewFoundListener listener = iterator.next(); - if (nativeId != null && nativeId.equals(listener.getNativeId())) { + if (nativeId.equals(listener.getNativeId())) { listener.onViewFound(view); iterator.remove(); } } - for (Map.Entry> entry : mOnMultipleViewsFoundListener.entrySet()) { Set nativeIds = entry.getValue();