From 6eec39313dc6a088bc870a47de3a74c69714d4c9 Mon Sep 17 00:00:00 2001 From: David Vacca Date: Tue, 2 Jul 2019 14:40:01 -0700 Subject: [PATCH] Deprecate receiveCommand method for INT commands Summary: This diff deprecates: ``` public void receiveCommand(int reactTag, int commandId, Nullable ReadableArray commandArgs) { ``` in favor of: ``` public void receiveCommand(int reactTag, String commandId, Nullable ReadableArray commandArgs) { ``` Reviewed By: JoshuaGross, TheSavior Differential Revision: D16019254 fbshipit-source-id: 61efefe5d5c43f9b24b729f17229725b87b60a1f --- .../main/java/com/facebook/react/fabric/FabricUIManager.java | 1 + .../com/facebook/react/fabric/mounting/MountingManager.java | 1 + .../facebook/react/uimanager/NativeViewHierarchyManager.java | 1 + .../java/com/facebook/react/uimanager/UIImplementation.java | 1 + .../java/com/facebook/react/uimanager/UIManagerModule.java | 2 ++ .../com/facebook/react/uimanager/UIViewOperationQueue.java | 2 ++ .../main/java/com/facebook/react/uimanager/ViewManager.java | 3 +++ 7 files changed, 11 insertions(+) diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java index b2bbb60d466..98e7296546b 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java +++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java @@ -480,6 +480,7 @@ public class FabricUIManager implements UIManager, LifecycleEventListener { @Override public void onHostDestroy() {} + @Deprecated @Override public void dispatchCommand( final int reactTag, final int commandId, @Nullable final ReadableArray commandArgs) { diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/MountingManager.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/MountingManager.java index 16ceee84747..848861b3356 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/MountingManager.java +++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/MountingManager.java @@ -134,6 +134,7 @@ public class MountingManager { return viewState; } + @Deprecated public void receiveCommand(int reactTag, int commandId, @Nullable ReadableArray commandArgs) { ViewState viewState = getViewState(reactTag); diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/NativeViewHierarchyManager.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/NativeViewHierarchyManager.java index 513f32a0c36..3fe3ba2e6b9 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/NativeViewHierarchyManager.java +++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/NativeViewHierarchyManager.java @@ -737,6 +737,7 @@ public class NativeViewHierarchyManager { mLayoutAnimator.reset(); } + @Deprecated public synchronized void dispatchCommand( int reactTag, int commandId, @Nullable ReadableArray args) { UiThreadUtil.assertOnUiThread(); diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIImplementation.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIImplementation.java index 9a73e556e6a..3bc192c9adb 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIImplementation.java +++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIImplementation.java @@ -689,6 +689,7 @@ public class UIImplementation { mOperationsQueue.enqueueClearJSResponder(); } + @Deprecated public void dispatchViewManagerCommand( int reactTag, int commandId, @Nullable ReadableArray commandArgs) { assertViewExists(reactTag, "dispatchViewManagerCommand"); diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModule.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModule.java index a2b18000298..d125cb5dfca 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModule.java +++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModule.java @@ -659,6 +659,8 @@ public class UIManagerModule extends ReactContextBaseJavaModule } } + /** Deprecated, use {@link #dispatchCommand(int, String, ReadableArray)} instead. */ + @Deprecated @Override public void dispatchCommand(int reactTag, int commandId, @Nullable ReadableArray commandArgs) { mUIImplementation.dispatchViewManagerCommand(reactTag, commandId, commandArgs); diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIViewOperationQueue.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIViewOperationQueue.java index 1623ac7f86b..60b664ee9b6 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIViewOperationQueue.java +++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIViewOperationQueue.java @@ -261,6 +261,7 @@ public class UIViewOperationQueue { } } + @Deprecated private final class DispatchCommandOperation extends ViewOperation { private final int mCommand; @@ -613,6 +614,7 @@ public class UIViewOperationQueue { mOperations.add(new ChangeJSResponderOperation(0, 0, true /*clearResponder*/, false)); } + @Deprecated public void enqueueDispatchCommand( int reactTag, int commandId, @Nullable ReadableArray commandArgs) { mOperations.add(new DispatchCommandOperation(reactTag, commandId, commandArgs)); diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManager.java index f7e0ea554ae..b371db77925 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManager.java +++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManager.java @@ -159,10 +159,13 @@ public abstract class ViewManager * UIManager}. Good example of such a command would be {@code scrollTo} request with coordinates * for a {@link ScrollView} instance. * + *

This method is deprecated use {@link #receiveCommand(View, String, ReadableArray)} instead. + * * @param root View instance that should receive the command * @param commandId code of the command * @param args optional arguments for the command */ + @Deprecated public void receiveCommand(@Nonnull T root, int commandId, @Nullable ReadableArray args) {} /**