diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/JSEngineInstance.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/JSEngineInstance.java index d4adeef240d..c7c2e32ebde 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/JSEngineInstance.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/JSEngineInstance.java @@ -18,7 +18,7 @@ public abstract class JSEngineInstance { SoLoader.loadLibrary("rninstance"); } - @DoNotStrip private HybridData mHybridData; + @DoNotStrip private final HybridData mHybridData; protected JSEngineInstance(HybridData hybridData) { mHybridData = hybridData; 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 c04059a9604..bdb13224049 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 @@ -73,7 +73,7 @@ final class ReactInstance { private static final String TAG = ReactInstance.class.getSimpleName(); - @DoNotStrip private HybridData mHybridData; + @DoNotStrip private final HybridData mHybridData; private final ReactInstanceDelegate mDelegate; private final BridgelessReactContext mBridgelessReactContext; @@ -172,17 +172,15 @@ final class ReactInstance { new ComponentNameResolverManager( // Use unbuffered RuntimeExecutor to install binding unbufferedRuntimeExecutor, - new ComponentNameResolver() { - @Override - public String[] getComponentNames() { - Collection viewManagerNames = getViewManagerNames(); - if (viewManagerNames.size() < 1) { - FLog.e(TAG, "No ViewManager names found"); - return new String[0]; - } - return viewManagerNames.toArray(new String[0]); - } - }); + (ComponentNameResolver) + () -> { + Collection viewManagerNames = getViewManagerNames(); + if (viewManagerNames.size() < 1) { + FLog.e(TAG, "No ViewManager names found"); + return new String[0]; + } + return viewManagerNames.toArray(new String[0]); + }); // Set up TurboModules Systrace.beginSection( diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/ReactSurface.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/ReactSurface.java index b6e8cf98feb..c7898a1c576 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/ReactSurface.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/ReactSurface.java @@ -32,7 +32,6 @@ import javax.annotation.Nullable; @Nullsafe(Nullsafe.Mode.LOCAL) @ThreadSafe public class ReactSurface { - private static final String TAG = "ReactSurface"; private final AtomicReference mSurfaceView = new AtomicReference<>(null); @@ -180,14 +179,11 @@ public class ReactSurface { public void clear() { UiThreadUtil.runOnUiThread( - new Runnable() { - @Override - public void run() { - ReactSurfaceView view = getView(); - if (view != null) { - view.removeAllViews(); - view.setId(View.NO_ID); - } + () -> { + ReactSurfaceView view = getView(); + if (view != null) { + view.removeAllViews(); + view.setId(View.NO_ID); } }); } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/ReactSurfaceView.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/ReactSurfaceView.java index eae0988ba7e..0467148d5ac 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/ReactSurfaceView.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/ReactSurfaceView.java @@ -25,6 +25,7 @@ import com.facebook.react.uimanager.JSTouchDispatcher; import com.facebook.react.uimanager.common.UIManagerType; import com.facebook.react.uimanager.events.EventDispatcher; import com.facebook.systrace.Systrace; +import java.util.Objects; /** A view created by {@link ReactSurface} that's responsible for rendering a React component. */ @Nullsafe(Nullsafe.Mode.LOCAL) @@ -161,10 +162,11 @@ public class ReactSurfaceView extends ReactRootView { @Override public void handleException(Throwable t) { - if (mSurface.getReactHost() != null) { - String errorMessage = t.getMessage() == null ? "" : t.getMessage(); + ReactHost reactHost = mSurface.getReactHost(); + if (reactHost != null) { + String errorMessage = Objects.toString(t.getMessage(), ""); Exception e = new IllegalViewOperationException(errorMessage, this, t); - mSurface.getReactHost().handleException(e); + reactHost.handleException(e); } }