TySS-Dev/nearby
1
0
Fork 0
mirror of https://github.com/kidfromjupiter/nearby.git synced 2026-09-16 15:36:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add support for sharing DiscoveryCallbacks across BluetoothDevices.

Browse Source
This commit is contained in:
Vibhav Pant
2023-09-05 20:00:25 +05:30
parent ad7401616b
commit 4042687b8d
7 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/platform/implementation/linux/bluetooth_classic_medium.cc
+5 -4
View File
@@ -64,9 +64,9 @@ void BluetoothClassicMedium::onInterfacesAdded(
NEARBY_LOGS(INFO) << __func__ << ": Encountered new device at " << object;
auto device = devices_->add_new_device(object);
if (discovery_cb_.has_value() &&
if (discovery_cb_ != nullptr &&
discovery_cb_->device_discovered_cb != nullptr) {
device->SetDiscoveryCallback(discovery_cb_);
discovery_cb_->device_discovered_cb(*device);
}
@@ -98,7 +98,7 @@ void BluetoothClassicMedium::onInterfacesRemoved(
NEARBY_LOGS(INFO) << __func__ << ": Device " << object
<< " has been removed";
if (discovery_cb_.has_value() &&
if (discovery_cb_ != nullptr &&
discovery_cb_->device_lost_cb != nullptr) {
discovery_cb_->device_lost_cb(*device);
}
@@ -114,7 +114,8 @@ void BluetoothClassicMedium::onInterfacesRemoved(
bool BluetoothClassicMedium::StartDiscovery(
DiscoveryCallback discovery_callback) {
discovery_cb_ = std::move(discovery_callback);
discovery_cb_ =
std::make_shared<DiscoveryCallback>(std::move(discovery_callback));
try {
NEARBY_LOGS(INFO) << __func__ << ": Starting discovery on "