Skip to content

Commit

Permalink
Keep management of outgoing_share_target_map_ and outgoing_share_sess…
Browse files Browse the repository at this point in the history
…ion_map_ together.

PiperOrigin-RevId: 721886250
  • Loading branch information
ftsui authored and copybara-github committed Jan 31, 2025
1 parent a51a93a commit b11bdeb
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions sharing/nearby_sharing_service_impl.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1790,7 +1790,6 @@ void NearbySharingServiceImpl::OnOutgoingDecryptedCertificate(
VLOG(1) << __func__ << ": Adding (endpoint_id=" << endpoint_id
<< ", share_target_id=" << share_target->id
<< ") to outgoing share target map";
outgoing_share_target_map_.insert_or_assign(endpoint_id, *share_target);
CreateOutgoingShareSession(*share_target, endpoint_id,
std::move(certificate));

Expand Down Expand Up @@ -3229,7 +3228,6 @@ bool NearbySharingServiceImpl::FindDuplicateInDiscoveryCache(
<< it->second.share_target.id;
share_target.id = it->second.share_target.id;
discovery_cache_.erase(it);
outgoing_share_target_map_.insert_or_assign(endpoint_id, share_target);
return true;
}

Expand All @@ -3244,7 +3242,6 @@ bool NearbySharingServiceImpl::FindDuplicateInDiscoveryCache(
// Copy only the id field from cache entry,
share_target.id = it->second.share_target.id;
discovery_cache_.erase(it);
outgoing_share_target_map_.insert_or_assign(endpoint_id, share_target);
return true;
}
}
Expand Down Expand Up @@ -3379,6 +3376,7 @@ void NearbySharingServiceImpl::MoveToDiscoveryCache(std::string endpoint_id,
void NearbySharingServiceImpl::CreateOutgoingShareSession(
const ShareTarget& share_target, absl::string_view endpoint_id,
std::optional<NearbyShareDecryptedPublicCertificate> certificate) {
outgoing_share_target_map_.insert_or_assign(endpoint_id, share_target);
auto [it_out, inserted] = outgoing_share_session_map_.try_emplace(
share_target.id, context_->GetClock(), *service_thread_,
nearby_connections_manager_.get(), analytics_recorder_,
Expand Down

0 comments on commit b11bdeb

Please sign in to comment.