diff --git a/android/src/main/cpp/sonar.cpp b/android/src/main/cpp/sonar.cpp index 5d7208d69..8a590f734 100644 --- a/android/src/main/cpp/sonar.cpp +++ b/android/src/main/cpp/sonar.cpp @@ -524,7 +524,7 @@ class JFlipperConnectionImpl } void sendString(const std::string method, const std::string params) { - _connection->send(std::move(method), std::move(params)); + _connection->sendRaw(std::move(method), std::move(params)); } void sendObject( diff --git a/xplat/Flipper/FlipperConnection.h b/xplat/Flipper/FlipperConnection.h index 12cd22f46..825d85160 100644 --- a/xplat/Flipper/FlipperConnection.h +++ b/xplat/Flipper/FlipperConnection.h @@ -38,7 +38,9 @@ class FlipperConnection { identifier. Note: The `message` argument is expected to contain a valid JSON. */ - virtual void send(const std::string& method, const std::string& params) = 0; + virtual void sendRaw( + const std::string& method, + const std::string& params) = 0; /** Report an error to the Flipper desktop app diff --git a/xplat/Flipper/FlipperConnectionImpl.h b/xplat/Flipper/FlipperConnectionImpl.h index e0b646ae7..e2d3fa28c 100644 --- a/xplat/Flipper/FlipperConnectionImpl.h +++ b/xplat/Flipper/FlipperConnectionImpl.h @@ -53,7 +53,7 @@ class FlipperConnectionImpl : public FlipperConnection { socket_->sendMessage(message); } - void send(const std::string& method, const std::string& params) override { + void sendRaw(const std::string& method, const std::string& params) override { std::stringstream ss; ss << "{" "\"method\": \"execute\"," @@ -66,8 +66,8 @@ class FlipperConnectionImpl : public FlipperConnection { << "\"," "\"params\":" << params << "}}"; - - socket_->sendMessage(ss.str()); + auto message = ss.str(); + socket_->sendMessage(message); } void error(const std::string& message, const std::string& stacktrace) diff --git a/xplat/Flipper/FlipperConnectionManager.h b/xplat/Flipper/FlipperConnectionManager.h index 1387791ff..f83b971eb 100644 --- a/xplat/Flipper/FlipperConnectionManager.h +++ b/xplat/Flipper/FlipperConnectionManager.h @@ -58,7 +58,7 @@ class FlipperConnectionManager { Send message to the ws server. Note: The `message` argument is expected to contain a valid JSON. */ - virtual void sendMessage(const std::string& message) = 0; + virtual void sendMessageRaw(const std::string& message) = 0; /** Handler for connection and message receipt from the ws server. diff --git a/xplat/Flipper/FlipperConnectionManagerImpl.cpp b/xplat/Flipper/FlipperConnectionManagerImpl.cpp index 10d5537c0..6840b960f 100644 --- a/xplat/Flipper/FlipperConnectionManagerImpl.cpp +++ b/xplat/Flipper/FlipperConnectionManagerImpl.cpp @@ -341,7 +341,7 @@ void FlipperConnectionManagerImpl::sendMessage(const folly::dynamic& message) { }); } -void FlipperConnectionManagerImpl::sendMessage(const std::string& message) { +void FlipperConnectionManagerImpl::sendMessageRaw(const std::string& message) { flipperScheduler_->schedule([this, message]() { try { if (client_) { diff --git a/xplat/Flipper/FlipperConnectionManagerImpl.h b/xplat/Flipper/FlipperConnectionManagerImpl.h index 3a586130b..c9f4875ad 100644 --- a/xplat/Flipper/FlipperConnectionManagerImpl.h +++ b/xplat/Flipper/FlipperConnectionManagerImpl.h @@ -42,7 +42,7 @@ class FlipperConnectionManagerImpl : public FlipperConnectionManager { void sendMessage(const folly::dynamic& message) override; - void sendMessage(const std::string& message) override; + void sendMessageRaw(const std::string& message) override; void onMessageReceived( const folly::dynamic& message, diff --git a/xplat/FlipperTestLib/FlipperConnectionManagerMock.h b/xplat/FlipperTestLib/FlipperConnectionManagerMock.h index 51f57ba92..0970d18aa 100644 --- a/xplat/FlipperTestLib/FlipperConnectionManagerMock.h +++ b/xplat/FlipperTestLib/FlipperConnectionManagerMock.h @@ -40,7 +40,7 @@ class FlipperConnectionManagerMock : public FlipperConnectionManager { messages.push_back(message); } - void sendMessage(const std::string& message) override { + void sendMessageRaw(const std::string& message) override { messages.push_back(folly::parseJson(message)); } diff --git a/xplat/FlipperTestLib/FlipperConnectionMock.h b/xplat/FlipperTestLib/FlipperConnectionMock.h index d662bf290..cc9b5f12e 100644 --- a/xplat/FlipperTestLib/FlipperConnectionMock.h +++ b/xplat/FlipperTestLib/FlipperConnectionMock.h @@ -23,7 +23,7 @@ class FlipperConnectionMock : public FlipperConnection { sent_message_history[method].push(params); } - void send(const std::string& method, const std::string& params) override { + void sendRaw(const std::string& method, const std::string& params) override { sent_[method] = folly::parseJson(params); sent_message_history[method].push(params); }