From 76a9b3d3aea06f3cf55c337589f471f4496951ba Mon Sep 17 00:00:00 2001 From: Lorenzo Blasa Date: Fri, 21 Jan 2022 07:27:11 -0800 Subject: [PATCH] Remove sendLegacyCertificateRequest Summary: Legacy certificate request is most likely deadcode by now. Remove it. Changelog: Remove legacy certificate request Reviewed By: antonk52 Differential Revision: D33707396 fbshipit-source-id: 47a410204bcd2ed843b716461df105ebc48264a6 --- .../Flipper/FlipperConnectionManagerImpl.cpp | 31 ++++--------------- xplat/Flipper/FlipperConnectionManagerImpl.h | 1 - 2 files changed, 6 insertions(+), 26 deletions(-) diff --git a/xplat/Flipper/FlipperConnectionManagerImpl.cpp b/xplat/Flipper/FlipperConnectionManagerImpl.cpp index 4ca0f3202..3ae4ff753 100644 --- a/xplat/Flipper/FlipperConnectionManagerImpl.cpp +++ b/xplat/Flipper/FlipperConnectionManagerImpl.cpp @@ -413,16 +413,12 @@ void FlipperConnectionManagerImpl::requestSignedCertFromFlipper() { return; certificateExchangeCompleted_ = true; if (isError) { - if (response.compare("not implemented")) { - auto error = - "Desktop failed to provide certificates. Error from flipper desktop:\n" + - response; - log(error); - gettingCert->fail(error); - client_ = nullptr; - } else { - sendLegacyCertificateRequest(message); - } + auto error = + "Desktop failed to provide certificates. Error from flipper desktop:\n" + + response; + log(error); + gettingCert->fail(error); + client_ = nullptr; return; } if (!response.empty()) { @@ -468,21 +464,6 @@ void FlipperConnectionManagerImpl::requestSignedCertFromFlipper() { failedConnectionAttempts_ = 0; } -void FlipperConnectionManagerImpl::sendLegacyCertificateRequest( - folly::dynamic message) { - // Desktop is using an old version of Flipper. - // Fall back to fireAndForget, instead of requestResponse. - auto sendingRequest = - flipperState_->start("Sending fallback certificate request"); - - client_->send(message, [this, sendingRequest]() { - sendingRequest->complete(); - folly::dynamic config = folly::dynamic::object(); - contextStore_->storeConnectionConfig(config); - client_ = nullptr; - }); -} - /** Check for the maximum number of failed socket connection attempts. If exceeded, then swap the default socket provider. If the maximum diff --git a/xplat/Flipper/FlipperConnectionManagerImpl.h b/xplat/Flipper/FlipperConnectionManagerImpl.h index 1bd38ee16..1bad5cac0 100644 --- a/xplat/Flipper/FlipperConnectionManagerImpl.h +++ b/xplat/Flipper/FlipperConnectionManagerImpl.h @@ -86,7 +86,6 @@ class FlipperConnectionManagerImpl : public FlipperConnectionManager { bool isCertificateExchangeNeeded(); void requestSignedCertFromFlipper(); bool isRunningInOwnThread(); - void sendLegacyCertificateRequest(folly::dynamic message); void reevaluateSocketProvider(); std::string getDeviceId(); };