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

[Nearby] Fix cached/duplicate share target issue

We don't support caching share targets so this code removes an attempt
to keep cached targets around which causes duplicates to show up in the
ui.

Fixed: 1133824
Change-Id: I3162cfffae59ca638b2b21e5f9adf6d4a2cc21a3
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2446845
Commit-Queue: James Vecore <vecore@google.com>
Commit-Queue: Ryan Hansberry <hansberry@chromium.org>
Auto-Submit: James Vecore <vecore@google.com>
Reviewed-by: default avatarRyan Hansberry <hansberry@chromium.org>
Cr-Commit-Position: refs/heads/master@{#813447}
parent 2599c7d2
...@@ -3282,19 +3282,12 @@ void NearbySharingServiceImpl::UnregisterShareTarget( ...@@ -3282,19 +3282,12 @@ void NearbySharingServiceImpl::UnregisterShareTarget(
if (it != outgoing_share_target_info_map_.end()) if (it != outgoing_share_target_info_map_.end())
endpoint_id = it->second.endpoint_id(); endpoint_id = it->second.endpoint_id();
// Remove info except for this endpoint id, if present. // TODO(crbug/1108348): Support caching manager by keeping track of the
// share_target/endpoint_id for next time.
ClearOutgoingShareTargetInfoMap(); ClearOutgoingShareTargetInfoMap();
if (endpoint_id) { NS_LOG(VERBOSE) << __func__ << ": Unregister share target: "
NS_LOG(VERBOSE) << __func__ << ": Unregister share target: " << share_target.device_name;
<< share_target.device_name;
GetOrCreateShareTargetInfo(share_target, *endpoint_id);
} else {
NS_LOG(VERBOSE)
<< __func__
<< ": Cannot unregister share target since none registered: "
<< share_target.device_name;
}
} }
mutual_acceptance_timeout_alarm_.Cancel(); mutual_acceptance_timeout_alarm_.Cancel();
} }
......
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