bluetooth: mac: add connected LE devices to chooser

device/bluetooth/bluetooth_adapter_mac.mm

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "device/bluetooth/bluetooth_adapter_mac.h"
 
 #import <IOBluetooth/objc/IOBluetoothDevice.h>
 #import <IOBluetooth/objc/IOBluetoothHostController.h>
 #include <stddef.h>
 
@@ skipping 55 matching lines @@
 }
 
 // static
 BluetoothUUID BluetoothAdapterMac::BluetoothUUIDWithCBUUID(CBUUID* uuid) {
   // UUIDString only available OS X >= 10.10.
   DCHECK(base::mac::IsAtLeastOS10_10());
   std::string uuid_c_string = base::SysNSStringToUTF8([uuid UUIDString]);
   return device::BluetoothUUID(uuid_c_string);
 }
 
+// static
+NSArray* BluetoothAdapterMac::CBUUIDArrayWithUUIDList(
+    BluetoothDevice::UUIDList services_uuids) {
+  NSMutableArray* services = nil;
+  if (!services_uuids.empty()) {
+    services = [NSMutableArray array];
+    for (auto& service_uuid : services_uuids) {
+      NSString* uuidString =
+          base::SysUTF8ToNSString(service_uuid.canonical_value().c_str());
+      CBUUID* uuid = [CBUUID UUIDWithString:uuidString];
+      [services addObject:uuid];
+    }
+  }
+  return [services copy];
+}
+
 BluetoothAdapterMac::BluetoothAdapterMac()
     : BluetoothAdapter(),
       classic_powered_(false),
       num_discovery_sessions_(0),
       classic_discovery_manager_(
           BluetoothDiscoveryManagerMac::CreateClassic(this)),
       weak_ptr_factory_(this) {
   if (IsLowEnergyAvailable()) {
     low_energy_discovery_manager_.reset(
         BluetoothLowEnergyDiscoveryManagerMac::Create(this));
@@ skipping 77 matching lines @@
 }
 
 bool BluetoothAdapterMac::IsDiscovering() const {
   bool is_discovering = classic_discovery_manager_->IsDiscovering();
   if (IsLowEnergyAvailable())
     is_discovering =
         is_discovering || low_energy_discovery_manager_->IsDiscovering();
   return is_discovering;
 }
 
+void BluetoothAdapter::RetrievedConnectedPeripherals() {
+  // It is not possible to ask for all connected peripherals with
+  // -[CBCentralManager retrieveConnectedPeripheralsWithServices:] by passing
+  // nil. To try to get most of the peripherals, the search is done with
+  // Generic Access service.
+  CBUUID* genericAccessServiceUUID = [CBUUID UUIDWithString:@"1800"];
+  NSArray* connectedServices = @[ genericAccessServiceUUID ];
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wpartial-availability"
+  // Can remove ignore -Wpartial-availability when 10.8 will not be supported

[ortuno, 2016/09/28 23:15:52]

Is there an issue you could include with this comment?

[jlebel, 2016/10/05 14:09:41]

Done.

+  // anymore
+  NSArray* peripherals = [low_energy_central_manager_
+      retrieveConnectedPeripheralsWithServices:connectedServices];
+#pragma clang diagnostic pop
+  for (CBPeripheral* peripheral in peripherals) {
+    LowEnergyDeviceUpdated(peripheral, nil /* advertisementData */,

[ortuno, 2016/09/28 23:15:52]

LowEnergyDeviceUpdated is meant to be used when receiving an advertisement. I
think you want a specific function for constructing devices from connected
peripherals.

[jlebel, 2016/10/05 14:09:41]

I don't know how to use the first part and the third part of
LowEnergyDeviceUpdated() without using the middle part, and without duplicating
the code.

I was thinking of creating FindOrCreateLowEnergyDeviceUpdated() to put the first
part of the method, but there is also an ownership problem, because the instance
returned in case of a new device would have to be release if not used, and not
for the case of a known device. Plus a flag would have to be returned from this
new method in order to know if the device should be added and to know which
notification should be sent (DeviceAdded or DeviceChanged).

+                           0 /* rssi */);
+  }
+}
+
 BluetoothAdapter::UUIDList BluetoothAdapterMac::GetUUIDs() const {
   NOTIMPLEMENTED();
   return UUIDList();
 }
 
 void BluetoothAdapterMac::CreateRfcommService(
     const BluetoothUUID& uuid,
     const ServiceOptions& options,
     const CreateServiceCallback& callback,
     const CreateServiceErrorCallback& error_callback) {
@@ skipping 181 matching lines @@
     // TODO(krstnmnlsn): If a classic discovery session is already running then
     // we should update its filter. crbug.com/498056
     if (!classic_discovery_manager_->StartDiscovery()) {
       DVLOG(1) << "Failed to add a classic discovery session";
       return false;
     }
   }
   if (transport & BLUETOOTH_TRANSPORT_LE) {
     // Begin a low energy discovery session or update it if one is already
     // running.
-    if (IsLowEnergyAvailable())
-      low_energy_discovery_manager_->StartDiscovery(
-          BluetoothDevice::UUIDList());
+    if (IsLowEnergyAvailable()) {
+      NSArray* services = CBUUIDArrayWithUUIDList(BluetoothDevice::UUIDList());

[ortuno, 2016/09/28 23:15:52]

This seems unrelated to this change.

[jlebel, 2016/10/05 14:09:41]

Done.

+      low_energy_discovery_manager_->StartDiscovery(services);
+    }
   }
   return true;
 }
 
 void BluetoothAdapterMac::Init() {
   ui_task_runner_ = base::ThreadTaskRunnerHandle::Get();
   PollAdapter();
 }
 
 void BluetoothAdapterMac::InitForTest(
@@ skipping 127 matching lines @@
       // hash the probability of this occuring with 10,000 devices
       // simultaneously present is 1e-6 (see
       // https://en.wikipedia.org/wiki/Birthday_problem#Probability_table).  We
       // ignore the second device by returning.
       return;
     }
   }
 
   DCHECK(device_mac);
 
-  // Get Advertised UUIDs
-  BluetoothDevice::UUIDList advertised_uuids;
-  NSArray* service_uuids =
-      [advertisement_data objectForKey:CBAdvertisementDataServiceUUIDsKey];
-  for (CBUUID* uuid in service_uuids) {
-    advertised_uuids.push_back(BluetoothUUID([[uuid UUIDString] UTF8String]));
+  if (advertisement_data) {
+    // Get Advertised UUIDs
+    BluetoothDevice::UUIDList advertised_uuids;
+    NSArray* service_uuids =
+        [advertisement_data objectForKey:CBAdvertisementDataServiceUUIDsKey];
+    for (CBUUID* uuid in service_uuids) {
+      advertised_uuids.push_back(BluetoothUUID([[uuid UUIDString] UTF8String]));
+    }
+    NSArray* overflow_service_uuids = [advertisement_data
+        objectForKey:CBAdvertisementDataOverflowServiceUUIDsKey];
+    for (CBUUID* uuid in overflow_service_uuids) {
+      advertised_uuids.push_back(BluetoothUUID([[uuid UUIDString] UTF8String]));
+    }
+
+    // Get Service Data.
+    BluetoothDevice::ServiceDataMap service_data_map;
+    NSDictionary* service_data =
+        [advertisement_data objectForKey:CBAdvertisementDataServiceDataKey];
+    for (CBUUID* uuid in service_data) {
+      NSData* data = [service_data objectForKey:uuid];
+      const uint8_t* bytes = static_cast<const uint8_t*>([data bytes]);
+      size_t length = [data length];
+      service_data_map.emplace(BluetoothUUID([[uuid UUIDString] UTF8String]),
+                               std::vector<uint8_t>(bytes, bytes + length));
+    }
+
+    // Get Tx Power.
+    NSNumber* tx_power =
+        [advertisement_data objectForKey:CBAdvertisementDataTxPowerLevelKey];
+    int8_t clamped_tx_power = BluetoothDevice::ClampPower([tx_power intValue]);
+
+    device_mac->UpdateAdvertisementData(
+        BluetoothDevice::ClampPower(rssi), std::move(advertised_uuids),
+        std::move(service_data_map),
+        tx_power == nil ? nullptr : &clamped_tx_power);
   }
-  NSArray* overflow_service_uuids = [advertisement_data
-      objectForKey:CBAdvertisementDataOverflowServiceUUIDsKey];
-  for (CBUUID* uuid in overflow_service_uuids) {
-    advertised_uuids.push_back(BluetoothUUID([[uuid UUIDString] UTF8String]));
-  }
-
-  // Get Service Data.
-  BluetoothDevice::ServiceDataMap service_data_map;
-  NSDictionary* service_data =
-      [advertisement_data objectForKey:CBAdvertisementDataServiceDataKey];
-  for (CBUUID* uuid in service_data) {
-    NSData* data = [service_data objectForKey:uuid];
-    const uint8_t* bytes = static_cast<const uint8_t*>([data bytes]);
-    size_t length = [data length];
-    service_data_map.emplace(BluetoothUUID([[uuid UUIDString] UTF8String]),
-                             std::vector<uint8_t>(bytes, bytes + length));
-  }
-
-  // Get Tx Power.
-  NSNumber* tx_power =
-      [advertisement_data objectForKey:CBAdvertisementDataTxPowerLevelKey];
-  int8_t clamped_tx_power = BluetoothDevice::ClampPower([tx_power intValue]);
-
-  device_mac->UpdateAdvertisementData(
-      BluetoothDevice::ClampPower(rssi), std::move(advertised_uuids),
-      std::move(service_data_map),
-      tx_power == nil ? nullptr : &clamped_tx_power);
 
   if (is_new_device) {
     std::string device_address =
         BluetoothLowEnergyDeviceMac::GetPeripheralHashAddress(peripheral);
     devices_.add(device_address, std::unique_ptr<BluetoothDevice>(device_mac));
     FOR_EACH_OBSERVER(BluetoothAdapter::Observer, observers_,
                       DeviceAdded(this, device_mac));
   } else {
     FOR_EACH_OBSERVER(BluetoothAdapter::Observer, observers_,
                       DeviceChanged(this, device_mac));
@@ skipping 78 matching lines @@
   std::string device_address =
       BluetoothLowEnergyDeviceMac::GetPeripheralHashAddress(peripheral);
   DevicesMap::const_iterator iter = devices_.find(device_address);
   if (iter == devices_.end()) {
     return nil;
   }
   return static_cast<BluetoothLowEnergyDeviceMac*>(iter->second);
 }
 
 }  // namespace device