Commit c6e9a6eb authored by James Vecore's avatar James Vecore Committed by Commit Bot

[Nearby] Clear last_x_metadata in UnregisterShareTarget

The last_incoming_metadata/last_outgoing_metadata was not ever getting
cleared on a successful transfer. This would cause a share target to
show up in discovery right away, but it would be a dead target that
would fail if you tried to use it.

Change-Id: I9679a6200fd948d0016484fee645c24db6f2ad77
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2425745
Auto-Submit: James Vecore <vecore@google.com>
Commit-Queue: Josh Nohle <nohle@chromium.org>
Reviewed-by: default avatarJosh Nohle <nohle@chromium.org>
Cr-Commit-Position: refs/heads/master@{#809738}
parent fdd5f399
...@@ -3179,10 +3179,18 @@ void NearbySharingServiceImpl::UnregisterShareTarget( ...@@ -3179,10 +3179,18 @@ void NearbySharingServiceImpl::UnregisterShareTarget(
<< share_target.device_name; << share_target.device_name;
if (share_target.is_incoming) { if (share_target.is_incoming) {
if (last_incoming_metadata_ &&
last_incoming_metadata_->first.id == share_target.id) {
last_incoming_metadata_.reset();
}
incoming_share_target_info_map_.erase(share_target.id); incoming_share_target_info_map_.erase(share_target.id);
// Clear legacy incoming payloads to release resource // Clear legacy incoming payloads to release resource
nearby_connections_manager_->ClearIncomingPayloads(); nearby_connections_manager_->ClearIncomingPayloads();
} else { } else {
if (last_outgoing_metadata_ &&
last_outgoing_metadata_->first.id == share_target.id) {
last_outgoing_metadata_.reset();
}
// Find the endpoint id that matches the given share target. // Find the endpoint id that matches the given share target.
base::Optional<std::string> endpoint_id; base::Optional<std::string> endpoint_id;
auto it = outgoing_share_target_info_map_.find(share_target.id); auto it = outgoing_share_target_info_map_.find(share_target.id);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment