diff --git a/sharing/nearby_sharing_service_impl.cc b/sharing/nearby_sharing_service_impl.cc index d7980137..94270d5c 100644 --- a/sharing/nearby_sharing_service_impl.cc +++ b/sharing/nearby_sharing_service_impl.cc @@ -873,19 +873,20 @@ void NearbySharingServiceImpl::Reject( void NearbySharingServiceImpl::Cancel( int64_t share_target_id, std::function status_codes_callback) { - RunOnAnyThread("api_cancel", [this, share_target_id, - status_codes_callback = - std::move(status_codes_callback)]() { - LOG(INFO) << __func__ << ": User canceled transfer"; - if (locally_cancelled_share_target_ids_.contains(share_target_id)) { - 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_id, std::move(status_codes_callback), - /*is_initiator_of_cancellation=*/true); - }); + RunOnNearbySharingServiceThread( + "api_cancel", + [this, share_target_id, + status_codes_callback = std::move(status_codes_callback)]() { + LOG(INFO) << __func__ << ": User canceled transfer"; + if (locally_cancelled_share_target_ids_.contains(share_target_id)) { + 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_id, std::move(status_codes_callback), + /*is_initiator_of_cancellation=*/true); + }); } // Note: |share_target| is intentionally passed by value. A share target @@ -2902,7 +2903,8 @@ void NearbySharingServiceImpl::OnFrameRead( switch (frame->type()) { case nearby::sharing::service::proto::V1Frame::CANCEL: - RunOnAnyThread("cancel_transfer", [this, share_target_id]() { + RunOnNearbySharingServiceThread("cancel_transfer", [this, + share_target_id]() { LOG(INFO) << __func__ << ": Read the cancel frame, closing connection"; DoCancel( share_target_id, [](StatusCodes status_codes) {}, @@ -3723,41 +3725,6 @@ void NearbySharingServiceImpl::RunOnNearbySharingServiceThreadDelayed( }); } -void NearbySharingServiceImpl::RunOnAnyThread(absl::string_view task_name, - absl::AnyInvocable task) { - if (IsShuttingDown()) { - LOG(WARNING) << __func__ << ": Skip the task " << task_name - << " due to service is shutting down."; - return; - } - - LOG(INFO) << __func__ << ": Scheduled to run task " << task_name - << " 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)]() mutable { - std::shared_ptr is_shutting = is_shutting_down.lock(); - if (is_shutting == nullptr || *is_shutting) { - LOG(WARNING) << __func__ << ": Give up the task on runner thread " - << task_name << " due to service is shutting down."; - return; - } - - LOG(INFO) << __func__ << ": Started to run task " << task_name - << " on runner thread."; - task(); - - LOG(INFO) << __func__ << ": Completed to run task " << task_name - << " on runner thread."; - }); -} - -::location::nearby::proto::sharing::SharingUseCase -NearbySharingServiceImpl::GetSenderUseCase() { - // Returns unknown before group sharing is enabled. - return ::location::nearby::proto::sharing::SharingUseCase::USE_CASE_UNKNOWN; -} - void NearbySharingServiceImpl::UpdateFilePathsInProgress( bool update_file_paths) { update_file_paths_in_progress_ = update_file_paths; diff --git a/sharing/nearby_sharing_service_impl.h b/sharing/nearby_sharing_service_impl.h index d5a8cf71..6dd8fa74 100644 --- a/sharing/nearby_sharing_service_impl.h +++ b/sharing/nearby_sharing_service_impl.h @@ -449,13 +449,6 @@ class NearbySharingServiceImpl absl::Duration delay, absl::AnyInvocable task); - // Runs API/task on a random thread. - void RunOnAnyThread(absl::string_view task_name, - absl::AnyInvocable task); - - // Returns use case of sender. It is used by group share feature. - ::location::nearby::proto::sharing::SharingUseCase GetSenderUseCase(); - // Update file path for the file attachment. void UpdateFilePath(AttachmentContainer& container); // Returns true if Shutdown() has been called.