From 947d00c6c3b7a0e44e6243ec729d1f1f99dfe8cc Mon Sep 17 00:00:00 2001 From: Lorenzo Blasa Date: Wed, 24 Aug 2022 11:17:21 -0700 Subject: [PATCH] Fix send raw messages Summary: ^ The last change removed the overload of `send` in favour of `sendRaw` Reviewed By: LukeDefeo Differential Revision: D38946386 fbshipit-source-id: c4491c4afe4d719602c99878dc7185d436179aef --- android/src/main/cpp/sonar.cpp | 4 ++-- .../com/facebook/flipper/android/FlipperConnectionImpl.java | 4 ++-- xplat/Flipper/FlipperConnectionImpl.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/android/src/main/cpp/sonar.cpp b/android/src/main/cpp/sonar.cpp index 8a590f734..25f4b9169 100644 --- a/android/src/main/cpp/sonar.cpp +++ b/android/src/main/cpp/sonar.cpp @@ -514,7 +514,7 @@ class JFlipperConnectionImpl registerHybrid({ makeNativeMethod("sendObject", JFlipperConnectionImpl::sendObject), makeNativeMethod("sendArray", JFlipperConnectionImpl::sendArray), - makeNativeMethod("sendString", JFlipperConnectionImpl::sendString), + makeNativeMethod("sendRaw", JFlipperConnectionImpl::sendRaw), makeNativeMethod("reportError", JFlipperConnectionImpl::reportError), makeNativeMethod( "reportErrorWithMetadata", @@ -523,7 +523,7 @@ class JFlipperConnectionImpl }); } - void sendString(const std::string method, const std::string params) { + void sendRaw(const std::string method, const std::string params) { _connection->sendRaw(std::move(method), std::move(params)); } diff --git a/android/src/main/java/com/facebook/flipper/android/FlipperConnectionImpl.java b/android/src/main/java/com/facebook/flipper/android/FlipperConnectionImpl.java index 7dbb86667..db47c25e1 100644 --- a/android/src/main/java/com/facebook/flipper/android/FlipperConnectionImpl.java +++ b/android/src/main/java/com/facebook/flipper/android/FlipperConnectionImpl.java @@ -42,14 +42,14 @@ class FlipperConnectionImpl implements FlipperConnection { @Override public void send(String method, String params) { - sendString(method, params); + sendRaw(method, params); } public native void sendObject(String method, FlipperObject params); public native void sendArray(String method, FlipperArray params); - public native void sendString(String method, String params); + public native void sendRaw(String method, String params); @Override public native void reportErrorWithMetadata(String reason, String stackTrace); diff --git a/xplat/Flipper/FlipperConnectionImpl.h b/xplat/Flipper/FlipperConnectionImpl.h index e2d3fa28c..f4cde7dde 100644 --- a/xplat/Flipper/FlipperConnectionImpl.h +++ b/xplat/Flipper/FlipperConnectionImpl.h @@ -67,7 +67,7 @@ class FlipperConnectionImpl : public FlipperConnection { "\"params\":" << params << "}}"; auto message = ss.str(); - socket_->sendMessage(message); + socket_->sendMessageRaw(message); } void error(const std::string& message, const std::string& stacktrace)