jens/flipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove transient newClient

Browse Source 
Summary: This was a temporary variable which is not really needed, so remove.

Reviewed By: passy

Differential Revision: D46849864

fbshipit-source-id: 56fb52f9a80128fb746afcdc4d36225e6d596db2
This commit is contained in:
Lorenzo Blasa
2023-06-20 13:25:40 -07:00
committed by Facebook GitHub Bot
parent 4379317258
commit aa510b3fd0
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
xplat/Flipper/FlipperConnectionManagerImpl.cpp
View File

@@ -209,19 +209,20 @@ bool FlipperConnectionManagerImpl::connectAndExchangeCertificate() {
payload->sdk_version = sdkVersion; payload->sdk_version = sdkVersion;
payload->medium = medium; payload->medium = medium;
auto newClient = FlipperSocketProvider::socketCreate( client_ = FlipperSocketProvider::socketCreate(
endpoint, std::move(payload), flipperScheduler_); endpoint, std::move(payload), flipperScheduler_);
newClient->setEventHandler(ConnectionEvents(implWrapper_)); client_->setEventHandler(ConnectionEvents(implWrapper_));
auto connectingInsecurely = flipperState_->start("Connect insecurely"); auto connectingInsecurely = flipperState_->start("Connect insecurely");
connectionIsTrusted_ = false; connectionIsTrusted_ = false;
if (!newClient->connect(this)) { // Connect is just handled here, move this elsewhere.
if (!client_->connect(this)) {
connectingInsecurely->fail("Failed to connect"); connectingInsecurely->fail("Failed to connect");
client_ = nullptr;
return false; return false;
} }
client_ = std::move(newClient);
connectingInsecurely->complete(); connectingInsecurely->complete();
auto resettingState = flipperState_->start("Reset state"); auto resettingState = flipperState_->start("Reset state");
@@ -258,10 +259,10 @@ bool FlipperConnectionManagerImpl::connectSecurely() {
payload->csr = contextStore_->getCertificateSigningRequest().c_str(); payload->csr = contextStore_->getCertificateSigningRequest().c_str();
payload->csr_path = contextStore_->getCertificateDirectoryPath().c_str(); payload->csr_path = contextStore_->getCertificateDirectoryPath().c_str();
auto newClient = FlipperSocketProvider::socketCreate( client_ = FlipperSocketProvider::socketCreate(
endpoint, std::move(payload), connectionScheduler_, contextStore_.get()); endpoint, std::move(payload), connectionScheduler_, contextStore_.get());
newClient->setEventHandler(ConnectionEvents(implWrapper_)); client_->setEventHandler(ConnectionEvents(implWrapper_));
newClient->setMessageHandler([this](const std::string& msg) { client_->setMessageHandler([this](const std::string& msg) {
std::unique_ptr<FireAndForgetBasedFlipperResponder> responder; std::unique_ptr<FireAndForgetBasedFlipperResponder> responder;
auto message = folly::parseJson(msg); auto message = folly::parseJson(msg);
auto idItr = message.find("id"); auto idItr = message.find("id");
@@ -278,12 +279,13 @@ bool FlipperConnectionManagerImpl::connectSecurely() {
auto connectingSecurely = flipperState_->start("Connect securely"); auto connectingSecurely = flipperState_->start("Connect securely");
connectionIsTrusted_ = true; connectionIsTrusted_ = true;
if (!newClient->connect(this)) { // Connect is just handled here, move this elsewhere.
if (!client_->connect(this)) {
connectingSecurely->fail("Failed to connect"); connectingSecurely->fail("Failed to connect");
client_ = nullptr;
return false; return false;
} }
client_ = std::move(newClient);
connectingSecurely->complete(); connectingSecurely->complete();
failedConnectionAttempts_ = 0; failedConnectionAttempts_ = 0;
return true; return true;