From e5350b0e81b11be4366dec1b99f3326be3e51bcd Mon Sep 17 00:00:00 2001 From: Francis Tsui Date: Thu, 21 Mar 2024 12:41:25 -0700 Subject: [PATCH] Change sharing service APIs to accept share target ID. PiperOrigin-RevId: 617931356 --- sharing/BUILD | 1 + sharing/fake_nearby_sharing_service.cc | 11 +-- sharing/fake_nearby_sharing_service.h | 11 +-- sharing/nearby_sharing_service.h | 11 +-- sharing/nearby_sharing_service_impl.cc | 99 ++++++++++----------- sharing/nearby_sharing_service_impl.h | 20 +++-- sharing/nearby_sharing_service_impl_test.cc | 44 ++++----- 7 files changed, 100 insertions(+), 97 deletions(-) diff --git a/sharing/BUILD b/sharing/BUILD index b20273ae..da16f429 100644 --- a/sharing/BUILD +++ b/sharing/BUILD @@ -183,6 +183,7 @@ cc_library( "@com_google_absl//absl/base:core_headers", "@com_google_absl//absl/container:flat_hash_map", "@com_google_absl//absl/container:flat_hash_set", + "@com_google_absl//absl/functional:any_invocable", "@com_google_absl//absl/hash", "@com_google_absl//absl/meta:type_traits", "@com_google_absl//absl/random", diff --git a/sharing/fake_nearby_sharing_service.cc b/sharing/fake_nearby_sharing_service.cc index 7fa29042..04d678fe 100644 --- a/sharing/fake_nearby_sharing_service.cc +++ b/sharing/fake_nearby_sharing_service.cc @@ -14,6 +14,7 @@ #include "sharing/fake_nearby_sharing_service.h" +#include #include #include #include @@ -132,7 +133,7 @@ bool FakeNearbySharingService::IsScanning() const { return false; } // Sends |attachments| to the remote |share_target|. void FakeNearbySharingService::SendAttachments( - const ShareTarget& share_target, + int64_t share_target_id, std::vector> attachments, std::function status_codes_callback) { status_codes_callback(StatusCodes::kOk); @@ -140,21 +141,21 @@ void FakeNearbySharingService::SendAttachments( // Accepts incoming share from the remote |share_target|. void FakeNearbySharingService::Accept( - const ShareTarget& share_target, + int64_t share_target_id, std::function status_codes_callback) { status_codes_callback(StatusCodes::kOk); } // Rejects incoming share from the remote |share_target|. void FakeNearbySharingService::Reject( - const ShareTarget& share_target, + int64_t share_target_id, std::function status_codes_callback) { status_codes_callback(StatusCodes::kOk); } // Cancels outgoing shares to the remote |share_target|. void FakeNearbySharingService::Cancel( - const ShareTarget& share_target, + int64_t share_target_id, std::function status_codes_callback) { status_codes_callback(StatusCodes::kOk); } @@ -162,7 +163,7 @@ void FakeNearbySharingService::Cancel( // Returns true if the local user cancelled the transfer to remote // |share_target|. bool FakeNearbySharingService::DidLocalUserCancelTransfer( - const ShareTarget& share_target) { + int64_t share_target_id) { return false; } diff --git a/sharing/fake_nearby_sharing_service.h b/sharing/fake_nearby_sharing_service.h index 55824984..c20197a4 100644 --- a/sharing/fake_nearby_sharing_service.h +++ b/sharing/fake_nearby_sharing_service.h @@ -15,6 +15,7 @@ #ifndef THIRD_PARTY_NEARBY_SHARING_FAKE_NEARBY_SHARING_SERVICE_H_ #define THIRD_PARTY_NEARBY_SHARING_FAKE_NEARBY_SHARING_SERVICE_H_ +#include #include #include #include @@ -95,28 +96,28 @@ class FakeNearbySharingService : public NearbySharingService { // Sends |attachments| to the remote |share_target|. void SendAttachments( - const ShareTarget& share_target, + int64_t share_target_id, std::vector> attachments, std::function status_codes_callback) override; // Accepts incoming share from the remote |share_target|. - void Accept(const ShareTarget& share_target, + void Accept(int64_t share_target_id, std::function status_codes_callback) override; // Rejects incoming share from the remote |share_target|. - void Reject(const ShareTarget& share_target, + void Reject(int64_t share_target_id, std::function status_codes_callback) override; // Cancels outgoing shares to the remote |share_target|. - void Cancel(const ShareTarget& share_target, + void Cancel(int64_t share_target_id, std::function status_codes_callback) override; // Returns true if the local user cancelled the transfer to remote // |share_target|. - bool DidLocalUserCancelTransfer(const ShareTarget& share_target) override; + bool DidLocalUserCancelTransfer(int64_t share_target_id) override; // Opens attachments from the remote |share_target|. void Open(const ShareTarget& share_target, diff --git a/sharing/nearby_sharing_service.h b/sharing/nearby_sharing_service.h index add4e08d..e01042d5 100644 --- a/sharing/nearby_sharing_service.h +++ b/sharing/nearby_sharing_service.h @@ -15,6 +15,7 @@ #ifndef THIRD_PARTY_NEARBY_SHARING_NEARBY_SHARING_SERVICE_H_ #define THIRD_PARTY_NEARBY_SHARING_NEARBY_SHARING_SERVICE_H_ +#include #include #include #include @@ -194,28 +195,28 @@ class NearbySharingService { // Sends |attachments| to the remote |share_target|. virtual void SendAttachments( - const ShareTarget& share_target, + int64_t share_target_id, std::vector> attachments, std::function status_codes_callback) = 0; // Accepts incoming share from the remote |share_target|. virtual void Accept( - const ShareTarget& share_target, + int64_t share_target_id, std::function status_codes_callback) = 0; // Rejects incoming share from the remote |share_target|. virtual void Reject( - const ShareTarget& share_target, + int64_t share_target_id, std::function status_codes_callback) = 0; // Cancels outgoing shares to the remote |share_target|. virtual void Cancel( - const ShareTarget& share_target, + int64_t share_target_id, std::function status_codes_callback) = 0; // Returns true if the local user cancelled the transfer to remote // |share_target|. - virtual bool DidLocalUserCancelTransfer(const ShareTarget& share_target) = 0; + virtual bool DidLocalUserCancelTransfer(int64_t share_target_id) = 0; // Opens attachments from the remote |share_target|. virtual void Open( diff --git a/sharing/nearby_sharing_service_impl.cc b/sharing/nearby_sharing_service_impl.cc index 0f6a2bf3..637631d8 100644 --- a/sharing/nearby_sharing_service_impl.cc +++ b/sharing/nearby_sharing_service_impl.cc @@ -31,6 +31,7 @@ #include "absl/algorithm/container.h" #include "absl/container/flat_hash_map.h" +#include "absl/functional/any_invocable.h" #include "absl/random/random.h" #include "absl/status/statusor.h" #include "absl/strings/str_cat.h" @@ -661,18 +662,13 @@ std::string NearbySharingServiceImpl::GetQrCodeUrl() const { } void NearbySharingServiceImpl::SendAttachments( - const ShareTarget& share_target, + int64_t share_target_id, std::vector> attachments, std::function status_codes_callback) { - ShareTarget share_target_copy = share_target; - for (std::unique_ptr& attachment : attachments) { - attachment->MoveToShareTarget(share_target_copy); - } - RunOnNearbySharingServiceThread( "api_send_attachments", - [this, share_target_copy = std::move(share_target_copy), - status_codes_callback = std::move(status_codes_callback)]() { + [this, share_target_id, attachments = std::move(attachments), + status_codes_callback = std::move(status_codes_callback)]() mutable { if (!is_scanning_) { NL_LOG(WARNING) << __func__ << ": Failed to send attachments. Not scanning."; @@ -686,7 +682,7 @@ void NearbySharingServiceImpl::SendAttachments( // |is_scanning_| and |is_transferring_| are mutually exclusive. NL_DCHECK(!is_transferring_); - if (!share_target_copy.has_attachments()) { + if (attachments.empty()) { NL_LOG(WARNING) << __func__ << ": No attachments to send."; std::move(status_codes_callback)(StatusCodes::kError); return; @@ -700,7 +696,7 @@ void NearbySharingServiceImpl::SendAttachments( return; } - ShareTargetInfo* info = GetShareTargetInfo(share_target_copy.id); + ShareTargetInfo* info = GetShareTargetInfo(share_target_id); if (!info) { NL_LOG(WARNING) << __func__ @@ -708,9 +704,13 @@ void NearbySharingServiceImpl::SendAttachments( std::move(status_codes_callback)(StatusCodes::kError); return; } + ShareTarget share_target = info->share_target(); + for (std::unique_ptr& attachment : attachments) { + attachment->MoveToShareTarget(share_target); + } // Set session ID. info->set_session_id(analytics_recorder_->GenerateNextId()); - info->set_share_target(share_target_copy); + info->set_share_target(share_target); // For sending advertisement from scanner, the request advertisement // should always be visible to everyone. @@ -724,9 +724,9 @@ void NearbySharingServiceImpl::SendAttachments( // Log analytics event of sending start. analytics_recorder_->NewSendStart( info->session_id(), - /*transfer_position=*/GetConnectedShareTargetPos(share_target_copy), + /*transfer_position=*/GetConnectedShareTargetPos(share_target), /*concurrent_connections=*/GetConnectedShareTargetCount(), - share_target_copy); + share_target); send_attachments_timestamp_ = context_->GetClock()->Now(); OnTransferStarted(/*is_incoming=*/false); @@ -736,12 +736,12 @@ void NearbySharingServiceImpl::SendAttachments( // Send process initialized successfully, from now on status updated // will be sent out via OnOutgoingTransferUpdate(). info->transfer_update_callback()->OnTransferUpdate( - share_target_copy, + share_target, TransferMetadataBuilder() .set_status(TransferMetadata::Status::kConnecting) .build()); - CreatePayloads(std::move(share_target_copy), + CreatePayloads(std::move(share_target), [this, endpoint_info = std::move(*endpoint_info)]( ShareTarget share_target, bool success) { // Log analytics event of describing attachments. @@ -757,13 +757,12 @@ void NearbySharingServiceImpl::SendAttachments( } void NearbySharingServiceImpl::Accept( - const ShareTarget& share_target, + int64_t share_target_id, std::function status_codes_callback) { RunOnNearbySharingServiceThread( "api_accept", - [&, share_target, + [this, share_target_id, status_codes_callback = std::move(status_codes_callback)]() { - int64_t share_target_id = share_target.id; // Log analytics event of responding to introduction. analytics_recorder_->NewRespondToIntroduction( ResponseToIntroduction::ACCEPT_INTRODUCTION, receiving_session_id_); @@ -789,6 +788,7 @@ void NearbySharingServiceImpl::Accept( } is_waiting_to_record_accept_to_transfer_start_metric_ = is_incoming; + ShareTarget share_target = info->share_target(); if (is_incoming) { incoming_share_accepted_timestamp_ = context_->GetClock()->Now(); ReceivePayloads(share_target, std::move(status_codes_callback)); @@ -800,9 +800,8 @@ void NearbySharingServiceImpl::Accept( } void NearbySharingServiceImpl::Reject( - const ShareTarget& share_target, + int64_t share_target_id, std::function status_codes_callback) { - int64_t share_target_id = share_target.id; RunOnNearbySharingServiceThread( "api_reject", [this, share_target_id, @@ -853,19 +852,19 @@ void NearbySharingServiceImpl::Reject( } void NearbySharingServiceImpl::Cancel( - const ShareTarget& share_target, + int64_t share_target_id, std::function status_codes_callback) { - RunOnAnyThread("api_cancel", [&, share_target, + RunOnAnyThread("api_cancel", [this, share_target_id, status_codes_callback = std::move(status_codes_callback)]() { NL_LOG(INFO) << __func__ << ": User canceled transfer"; - if (locally_cancelled_share_target_ids_.contains(share_target.id)) { + if (locally_cancelled_share_target_ids_.contains(share_target_id)) { NL_LOG(WARNING) << __func__ << ": Cancel is called again."; status_codes_callback(StatusCodes::kOutOfOrderApiCall); return; } - locally_cancelled_share_target_ids_.insert(share_target.id); - DoCancel(share_target, std::move(status_codes_callback), + locally_cancelled_share_target_ids_.insert(share_target_id); + DoCancel(share_target_id, std::move(status_codes_callback), /*is_initiator_of_cancellation=*/true); }); } @@ -874,20 +873,14 @@ void NearbySharingServiceImpl::Cancel( // reference could likely be invalidated by the owner during the multistep // cancellation process. void NearbySharingServiceImpl::DoCancel( - ShareTarget share_target, + int64_t share_target_id, std::function status_codes_callback, bool is_initiator_of_cancellation) { - int64_t share_target_id = share_target.id; ShareTargetInfo* info = GetShareTargetInfo(share_target_id); if (!info) { NL_LOG(ERROR) << __func__ << ": Cancel invoked for unknown share target, returning " "kOutOfOrderApiCall"; - // Make sure to clean up files just in case. - if (!update_file_paths_in_progress_) { - UpdateFilePath(share_target); - } - RemoveIncomingPayloads(share_target); std::move(status_codes_callback)(StatusCodes::kOutOfOrderApiCall); return; } @@ -936,12 +929,12 @@ void NearbySharingServiceImpl::DoCancel( << info->endpoint_id(); if (is_initiator_of_cancellation) { info->connection()->SetDisconnectionListener( - [&, share_target_id, info]() { + [this, share_target_id, info]() { info->set_connection(nullptr); bool is_incoming = info->IsIncoming(); RunOnNearbySharingServiceThread( "api_unregister_share_target", - [&, is_incoming, share_target_id]() { + [this, is_incoming, share_target_id]() { NL_LOG(INFO) << "Unregister share target in disconnection listener."; UnregisterShareTarget(is_incoming, share_target_id); @@ -950,7 +943,7 @@ void NearbySharingServiceImpl::DoCancel( RunOnNearbySharingServiceThreadDelayed( "initiator_cancel_delay", kInitiatorCancelDelay, - [&, share_target_id]() { + [this, share_target_id]() { NL_LOG(INFO) << "Close connection after cancellation delay."; CloseConnection(share_target_id); }); @@ -969,9 +962,9 @@ void NearbySharingServiceImpl::DoCancel( } bool NearbySharingServiceImpl::DidLocalUserCancelTransfer( - const ShareTarget& share_target) { + int64_t share_target_id) { return absl::c_linear_search(locally_cancelled_share_target_ids_, - share_target.id); + share_target_id); } void NearbySharingServiceImpl::Open( @@ -2872,6 +2865,7 @@ void NearbySharingServiceImpl::SendIntroduction( wifi_credentials.security_type()); wifi_credentials_metadata->set_payload_id(*payload_id); } + info->set_share_target(share_target); if (introduction->file_metadata_size() == 0 && introduction->text_metadata_size() == 0 && @@ -3982,7 +3976,7 @@ void NearbySharingServiceImpl::OnStorageCheckCompleted( if (is_self_share_auto_accept) { NL_LOG(INFO) << __func__ << ": Auto-accepting self share."; - Accept(share_target, [&](StatusCodes status_codes) { + Accept(share_target.id, [&](StatusCodes status_codes) { NL_LOG(INFO) << __func__ << ": Auto-accepting result: " << static_cast(status_codes); }); @@ -4010,7 +4004,7 @@ void NearbySharingServiceImpl::OnFrameRead( NL_LOG(INFO) << __func__ << ": Read the cancel frame, closing connection"; DoCancel( - share_target, [&](StatusCodes status_codes) {}, + share_target.id, [&](StatusCodes status_codes) {}, /*is_initiator_of_cancellation=*/false); }); break; @@ -4894,7 +4888,7 @@ bool NearbySharingServiceImpl::ReadyToAccept( } void NearbySharingServiceImpl::RunOnNearbySharingServiceThread( - absl::string_view task_name, std::function task) { + absl::string_view task_name, absl::AnyInvocable task) { if (is_shutting_down_ == nullptr || *is_shutting_down_) { NL_LOG(WARNING) << __func__ << ": Skip the task " << task_name << " due to service is shutting down."; @@ -4905,8 +4899,8 @@ void NearbySharingServiceImpl::RunOnNearbySharingServiceThread( << " on API thread."; service_thread_->PostTask( - [&, is_shutting_down = std::weak_ptr(is_shutting_down_), - task_name = std::string(task_name), task = std::move(task)]() { + [is_shutting_down = std::weak_ptr(is_shutting_down_), + task_name = std::string(task_name), task = std::move(task)]() mutable { std::shared_ptr is_shutting = is_shutting_down.lock(); if (is_shutting == nullptr || *is_shutting) { NL_LOG(WARNING) << __func__ << ": Give up the task " << task_name @@ -4925,7 +4919,7 @@ void NearbySharingServiceImpl::RunOnNearbySharingServiceThread( void NearbySharingServiceImpl::RunOnNearbySharingServiceThreadDelayed( absl::string_view task_name, absl::Duration delay, - std::function task) { + absl::AnyInvocable task) { if (is_shutting_down_ == nullptr || *is_shutting_down_) { NL_LOG(WARNING) << __func__ << ": Skip the delayed task " << task_name << " due to service is shutting down."; @@ -4935,8 +4929,9 @@ void NearbySharingServiceImpl::RunOnNearbySharingServiceThreadDelayed( NL_LOG(INFO) << __func__ << ": Scheduled to run delayed task " << task_name << " on API thread."; service_thread_->PostDelayedTask( - delay, [&, is_shutting_down = std::weak_ptr(is_shutting_down_), - task_name = std::string(task_name), task = std::move(task)]() { + delay, + [is_shutting_down = std::weak_ptr(is_shutting_down_), + task_name = std::string(task_name), task = std::move(task)]() mutable { std::shared_ptr is_shutting = is_shutting_down.lock(); if (is_shutting == nullptr || *is_shutting) { NL_LOG(WARNING) << __func__ << ": Give up the delayed task " @@ -4954,7 +4949,7 @@ void NearbySharingServiceImpl::RunOnNearbySharingServiceThreadDelayed( } void NearbySharingServiceImpl::RunOnAnyThread(absl::string_view task_name, - std::function task) { + absl::AnyInvocable task) { if (is_shutting_down_ == nullptr || *is_shutting_down_) { NL_LOG(WARNING) << __func__ << ": Skip the task " << task_name << " due to service is shutting down."; @@ -4962,23 +4957,23 @@ void NearbySharingServiceImpl::RunOnAnyThread(absl::string_view task_name, } NL_LOG(INFO) << __func__ << ": Scheduled to run task " << task_name - << " on API thread."; + << " on runner thread."; context_->GetTaskRunner()->PostTask( - [&, is_shutting_down = std::weak_ptr(is_shutting_down_), - task_name = std::string(task_name), task = std::move(task)]() { + [is_shutting_down = std::weak_ptr(is_shutting_down_), + task_name = std::string(task_name), task = std::move(task)]() mutable { std::shared_ptr is_shutting = is_shutting_down.lock(); if (is_shutting == nullptr || *is_shutting) { - NL_LOG(WARNING) << __func__ << ": Give up the delayed task " + NL_LOG(WARNING) << __func__ << ": Give up the task on runner thread " << task_name << " due to service is shutting down."; return; } NL_LOG(INFO) << __func__ << ": Started to run task " << task_name - << " on API thread."; + << " on runner thread."; task(); NL_LOG(INFO) << __func__ << ": Completed to run task " << task_name - << " on API thread."; + << " on runner thread."; }); } diff --git a/sharing/nearby_sharing_service_impl.h b/sharing/nearby_sharing_service_impl.h index 11de9a8f..4ac153ac 100644 --- a/sharing/nearby_sharing_service_impl.h +++ b/sharing/nearby_sharing_service_impl.h @@ -29,6 +29,7 @@ #include "absl/container/flat_hash_map.h" #include "absl/container/flat_hash_set.h" +#include "absl/functional/any_invocable.h" #include "absl/strings/string_view.h" #include "absl/time/time.h" #include "absl/types/span.h" @@ -147,19 +148,19 @@ class NearbySharingServiceImpl bool IsWifiPowered() const override; std::string GetQrCodeUrl() const override; void SendAttachments( - const ShareTarget& share_target, + int64_t share_target_id, std::vector> attachments, std::function status_codes_callback) override; - void Accept(const ShareTarget& share_target, + void Accept(int64_t share_target_id, std::function status_codes_callback) override; - void Reject(const ShareTarget& share_target, + void Reject(int64_t share_target_id, std::function status_codes_callback) override; - void Cancel(const ShareTarget& share_target, + void Cancel(int64_t share_target_id, std::function status_codes_callback) override; - bool DidLocalUserCancelTransfer(const ShareTarget& share_target) override; + bool DidLocalUserCancelTransfer(int64_t share_target_id) override; void Open(const ShareTarget& share_target, std::function status_codes_callback) override; @@ -435,7 +436,7 @@ class NearbySharingServiceImpl // reference could likely be invalidated by the owner during the multistep // cancellation process. void DoCancel( - ShareTarget share_target, + int64_t share_target_id, std::function status_codes_callback, bool is_initiator_of_cancellation); @@ -462,15 +463,16 @@ class NearbySharingServiceImpl // Runs API/task on the service thread to avoid UI block. void RunOnNearbySharingServiceThread(absl::string_view task_name, - std::function task); + absl::AnyInvocable task); // Runs API/task on the service thread with delayed time. void RunOnNearbySharingServiceThreadDelayed(absl::string_view task_name, absl::Duration delay, - std::function task); + absl::AnyInvocable task); // Runs API/task on a random thread. - void RunOnAnyThread(absl::string_view task_name, std::function task); + void RunOnAnyThread(absl::string_view task_name, + absl::AnyInvocable task); // Returns a 1-based position.It is used by group share feature. int GetConnectedShareTargetPos(const ShareTarget& target); diff --git a/sharing/nearby_sharing_service_impl_test.cc b/sharing/nearby_sharing_service_impl_test.cc index 6cf091c1..16f433ea 100644 --- a/sharing/nearby_sharing_service_impl_test.cc +++ b/sharing/nearby_sharing_service_impl_test.cc @@ -549,7 +549,7 @@ class NearbySharingServiceImplTest : public testing::Test { NearbySharingService::StatusCodes::kError; absl::Notification notification; service_->SendAttachments( - share_target, std::move(attachments), + share_target.id, std::move(attachments), [&](NearbySharingService::StatusCodes status_codes) { result = status_codes; notification.Notify(); @@ -978,7 +978,7 @@ class NearbySharingServiceImplTest : public testing::Test { absl::Notification send_notification; NearbySharingServiceImpl::StatusCodes send_result; service_->SendAttachments( - target, CreateTextAttachments({kTextPayload}), + target.id, CreateTextAttachments({kTextPayload}), [&](NearbySharingServiceImpl::StatusCodes status_codes) { send_result = status_codes; send_notification.Notify(); @@ -1092,17 +1092,19 @@ class NearbySharingServiceImplTest : public testing::Test { TransferMetadata::Status::kAwaitingRemoteAcceptance); })); - service_->Accept( - share_target, [&](NearbySharingServiceImpl::StatusCodes status_code) { - EXPECT_EQ(status_code, NearbySharingServiceImpl::StatusCodes::kOk); - notification.Notify(); - }); + service_->Accept(share_target.id, + [&](NearbySharingServiceImpl::StatusCodes status_code) { + EXPECT_EQ(status_code, + NearbySharingServiceImpl::StatusCodes::kOk); + notification.Notify(); + }); EXPECT_TRUE(notification.WaitForNotificationWithTimeout(kWaitTimeout)); // Fail to accept again. service_->Accept( - share_target, [&](NearbySharingServiceImpl::StatusCodes status_code) { + share_target.id, + [&](NearbySharingServiceImpl::StatusCodes status_code) { EXPECT_EQ(status_code, NearbySharingServiceImpl::StatusCodes::kOutOfOrderApiCall); }); @@ -2681,7 +2683,7 @@ TEST_F(NearbySharingServiceImplTest, AcceptInvalidShareTarget) { ShareTarget share_target; absl::Notification notification; service_->Accept( - share_target, [&](NearbySharingServiceImpl::StatusCodes status_code) { + share_target.id, [&](NearbySharingServiceImpl::StatusCodes status_code) { EXPECT_EQ(status_code, NearbySharingServiceImpl::StatusCodes::kOutOfOrderApiCall); notification.Notify(); @@ -2699,7 +2701,7 @@ TEST_F(NearbySharingServiceImplTest, absl::Notification notification; service_->Accept( - share_target, [&](NearbySharingServiceImpl::StatusCodes status_code) { + share_target.id, [&](NearbySharingServiceImpl::StatusCodes status_code) { EXPECT_EQ(NearbySharingServiceImpl::StatusCodes::kError, status_code); notification.Notify(); }); @@ -2746,7 +2748,7 @@ TEST_F(NearbySharingServiceImplTest, AcceptValidShareTarget) { })); service_->Accept( - share_target, [&](NearbySharingServiceImpl::StatusCodes status_code) { + share_target.id, [&](NearbySharingServiceImpl::StatusCodes status_code) { EXPECT_EQ(status_code, NearbySharingServiceImpl::StatusCodes::kOk); notification.Notify(); }); @@ -2792,7 +2794,7 @@ TEST_F(NearbySharingServiceImplTest, })); service_->Accept( - share_target, [&](NearbySharingServiceImpl::StatusCodes status_code) { + share_target.id, [&](NearbySharingServiceImpl::StatusCodes status_code) { EXPECT_EQ(status_code, NearbySharingServiceImpl::StatusCodes::kOk); notification.Notify(); }); @@ -2896,7 +2898,7 @@ TEST_F(NearbySharingServiceImplTest, AcceptValidShareTargetPayloadFailed) { })); service_->Accept( - share_target, [&](NearbySharingServiceImpl::StatusCodes status_code) { + share_target.id, [&](NearbySharingServiceImpl::StatusCodes status_code) { EXPECT_EQ(status_code, NearbySharingServiceImpl::StatusCodes::kOk); notification.Notify(); }); @@ -2964,7 +2966,7 @@ TEST_F(NearbySharingServiceImplTest, AcceptValidShareTargetPayloadCancelled) { })); service_->Accept( - share_target, [&](NearbySharingServiceImpl::StatusCodes status_code) { + share_target.id, [&](NearbySharingServiceImpl::StatusCodes status_code) { EXPECT_EQ(status_code, NearbySharingServiceImpl::StatusCodes::kOk); notification.Notify(); }); @@ -3016,7 +3018,7 @@ TEST_F(NearbySharingServiceImplTest, RejectInvalidShareTarget) { ShareTarget share_target; absl::Notification notification; service_->Reject( - share_target, [&](NearbySharingServiceImpl::StatusCodes status_code) { + share_target.id, [&](NearbySharingServiceImpl::StatusCodes status_code) { EXPECT_EQ(status_code, NearbySharingServiceImpl::StatusCodes::kOutOfOrderApiCall); notification.Notify(); @@ -3038,7 +3040,7 @@ TEST_F(NearbySharingServiceImplTest, RejectValidShareTarget) { })); service_->Reject( - share_target, [&](NearbySharingServiceImpl::StatusCodes status_code) { + share_target.id, [&](NearbySharingServiceImpl::StatusCodes status_code) { EXPECT_EQ(status_code, NearbySharingServiceImpl::StatusCodes::kOk); notification.Notify(); }); @@ -3690,7 +3692,7 @@ TEST_F(NearbySharingServiceImplTest, CancelSenderInitiator) { fake_nearby_connections_manager_->WasPayloadCanceled(info.payload_id)); // The initiator of the cancellation explicitly calls Cancel(). service_->Cancel( - target, [&](NearbySharingServiceImpl::StatusCodes status_code) { + target.id, [&](NearbySharingServiceImpl::StatusCodes status_code) { EXPECT_EQ(status_code, NearbySharingServiceImpl::StatusCodes::kOk); notification.Notify(); }); @@ -3761,7 +3763,7 @@ TEST_F(NearbySharingServiceImplTest, CancelReceiverInitiator) { fake_nearby_connections_manager_->WasPayloadCanceled(kFilePayloadId)); // The initiator of the cancellation explicitly calls Cancel(). service_->Cancel( - target, [&](NearbySharingServiceImpl::StatusCodes status_code) { + target.id, [&](NearbySharingServiceImpl::StatusCodes status_code) { EXPECT_EQ(NearbySharingServiceImpl::StatusCodes::kOk, status_code); notification.Notify(); }); @@ -4344,7 +4346,7 @@ TEST_F(NearbySharingServiceImplTest, SelfShareAutoAccept) { // Should fail to call accept. service_->Accept( - share_target, [&](NearbySharingServiceImpl::StatusCodes status_code) { + share_target.id, [&](NearbySharingServiceImpl::StatusCodes status_code) { EXPECT_EQ(status_code, NearbySharingServiceImpl::StatusCodes::kOutOfOrderApiCall); }); @@ -4386,7 +4388,7 @@ TEST_F(NearbySharingServiceImplTest, SelfShareNormalFlowWhenSelfshareDisabled) { })); service_->Accept( - share_target, [&](NearbySharingServiceImpl::StatusCodes status_code) { + share_target.id, [&](NearbySharingServiceImpl::StatusCodes status_code) { EXPECT_EQ(status_code, NearbySharingServiceImpl::StatusCodes::kOk); }); @@ -4409,7 +4411,7 @@ TEST_F(NearbySharingServiceImplTest, SelfShareNoAutoAcceptInForeground) { EXPECT_CALL(callback, OnTransferUpdate(testing::_, testing::_)).Times(0); service_->Accept( - share_target, [&](NearbySharingServiceImpl::StatusCodes status_code) { + share_target.id, [&](NearbySharingServiceImpl::StatusCodes status_code) { EXPECT_EQ(status_code, NearbySharingServiceImpl::StatusCodes::kOutOfOrderApiCall); });