From cd833c3bb065000bc76858393b63fc373bad97d6 Mon Sep 17 00:00:00 2001 From: Ramanpreet Nara Date: Tue, 14 Jan 2020 16:34:41 -0800 Subject: [PATCH] Make remaining NativeModules TurboModule-compatible Summary: This converts all NativeModules excluding the following into TurboModules: ``` // Deleted "fbsource/fbandroid/java/com/facebook/catalyst/modules/relaynativecache/RelayNativeCacheReaderModule.java" // Owners of FBC will migrate these by themselves "fbsource/xplat/fbc-mobile-app/android/app/src/main/java/com/fbc/i18n/FBCi18nAssetsModule.java" "fbsource/xplat/fbc-mobile-app/android/app/src/main/java/com/fbc/react/CellScanResultsModule.java" "fbsource/xplat/fbc-mobile-app/android/app/src/main/java/com/fbc/react/WiFiScanResultsModule.java" // Don't have Buck owners "fbsource/xplat/js/react-native-fbsdk/android/src/main/java/com/facebook/reactnative/androidsdk/FBAccessTokenModule.java" "fbsource/xplat/js/react-native-fbsdk/android/src/main/java/com/facebook/reactnative/androidsdk/FBGraphRequestModule.java" "fbsource/xplat/js/react-native-fbsdk/android/src/main/java/com/facebook/reactnative/androidsdk/FBLoginManagerModule.java" "fbsource/xplat/js/react-native-fbsdk/android/src/main/java/com/facebook/reactnative/androidsdk/FBShareAPIModule.java" "fbsource/xplat/intl/oss-fbt/__github__/react-native-fbt-android-native-module/android/src/main/java/com/reactlibrary/FbtAndroidNativeModule.java" ``` This should conclude the Android TurboModule migration. Changelog: [Android][Added] - Make remaining NativeModules TurboModule-compatible Reviewed By: PeteTheHeat Differential Revision: D19383442 fbshipit-source-id: 71beaee087f6436b197a65f0d68527d9964bb6ce --- .../com/facebook/react/devsupport/JSCHeapCapture.java | 7 +++---- .../java/com/facebook/react/devsupport/LogBoxModule.java | 9 ++++----- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/JSCHeapCapture.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/JSCHeapCapture.java index 142c961ade4..2880da77845 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/JSCHeapCapture.java +++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/JSCHeapCapture.java @@ -8,17 +8,16 @@ package com.facebook.react.devsupport; import androidx.annotation.Nullable; +import com.facebook.fbreact.specs.NativeJSCHeapCaptureSpec; import com.facebook.react.bridge.JavaScriptModule; import com.facebook.react.bridge.ReactApplicationContext; -import com.facebook.react.bridge.ReactContextBaseJavaModule; -import com.facebook.react.bridge.ReactMethod; import com.facebook.react.module.annotations.ReactModule; import java.io.File; // This module is being called only by Java via the static method "captureHeap" that // requires it to already be initialized, thus we eagerly initialize this module @ReactModule(name = JSCHeapCapture.TAG, needsEagerInit = true) -public class JSCHeapCapture extends ReactContextBaseJavaModule { +public class JSCHeapCapture extends NativeJSCHeapCaptureSpec { public static final String TAG = "JSCHeapCapture"; public interface HeapCapture extends JavaScriptModule { @@ -69,7 +68,7 @@ public class JSCHeapCapture extends ReactContextBaseJavaModule { } } - @ReactMethod + @Override public synchronized void captureComplete(String path, String error) { if (mCaptureInProgress != null) { if (error == null) { diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/LogBoxModule.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/LogBoxModule.java index 05e70b069d3..9050a421fb4 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/LogBoxModule.java +++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/LogBoxModule.java @@ -12,16 +12,15 @@ import android.view.View; import android.view.ViewGroup; import androidx.annotation.Nullable; import com.facebook.common.logging.FLog; +import com.facebook.fbreact.specs.NativeLogBoxSpec; import com.facebook.react.bridge.ReactApplicationContext; -import com.facebook.react.bridge.ReactContextBaseJavaModule; -import com.facebook.react.bridge.ReactMethod; import com.facebook.react.bridge.UiThreadUtil; import com.facebook.react.common.ReactConstants; import com.facebook.react.devsupport.interfaces.DevSupportManager; import com.facebook.react.module.annotations.ReactModule; @ReactModule(name = LogBoxModule.NAME) -public class LogBoxModule extends ReactContextBaseJavaModule { +public class LogBoxModule extends NativeLogBoxSpec { public static final String NAME = "LogBox"; @@ -54,7 +53,7 @@ public class LogBoxModule extends ReactContextBaseJavaModule { return NAME; } - @ReactMethod + @Override public void show() { UiThreadUtil.runOnUiThread( new Runnable() { @@ -77,7 +76,7 @@ public class LogBoxModule extends ReactContextBaseJavaModule { }); } - @ReactMethod + @Override public void hide() { UiThreadUtil.runOnUiThread( new Runnable() {