From 81998935749f8bc8aa5c679fcf90c596e725909f Mon Sep 17 00:00:00 2001 From: Marc Horowitz Date: Tue, 17 May 2016 14:15:51 -0700 Subject: [PATCH] Remove script argument to proxy loadApplicationScript Summary: The JSCExecutor API gets passed script data and a URL, but the proxy's purpose in life is to load from the network, so the script data is useless. The code was failing to handle null script data, so rather than just passing nullptr all the time, I removed the argument. if there's a use case in the future for it, we can put it back. Reviewed By: steveluscher Differential Revision: D3312467 fbshipit-source-id: 986c48f1ef3c24e6b5569046ccb08d7864cdcd3d --- .../main/java/com/facebook/react/bridge/JavaJSExecutor.java | 3 +-- .../com/facebook/react/bridge/WebsocketJavaScriptExecutor.java | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaJSExecutor.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaJSExecutor.java index 991fdfb6f29..0b119ce7f66 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaJSExecutor.java +++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaJSExecutor.java @@ -36,11 +36,10 @@ public interface JavaJSExecutor { /** * Load javascript into the js context - * @param script script contet to be executed * @param sourceURL url or file location from which script content was loaded */ @DoNotStrip - void loadApplicationScript(String script, String sourceURL) throws ProxyExecutorException; + void loadApplicationScript(String sourceURL) throws ProxyExecutorException; /** * Execute javascript method within js context diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/WebsocketJavaScriptExecutor.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/WebsocketJavaScriptExecutor.java index b9e1da2adbf..6198e56560a 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/bridge/WebsocketJavaScriptExecutor.java +++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/WebsocketJavaScriptExecutor.java @@ -159,7 +159,7 @@ public class WebsocketJavaScriptExecutor implements JavaJSExecutor { } @Override - public void loadApplicationScript(String script, String sourceURL) + public void loadApplicationScript(String sourceURL) throws ProxyExecutorException { JSExecutorCallbackFuture callback = new JSExecutorCallbackFuture(); Assertions.assertNotNull(mWebSocketClient).loadApplicationScript(