device/bluetooth: Improvements to GATT descriptor access API.

device/bluetooth/bluetooth_remote_gatt_characteristic_chromeos.cc

 // Copyright 2014 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_remote_gatt_characteristic_chromeos.h"
 
 #include "base/logging.h"
 #include "base/strings/stringprintf.h"
 #include "chromeos/dbus/bluetooth_gatt_characteristic_client.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
@@ skipping 96 matching lines @@
 
 std::vector<device::BluetoothGattDescriptor*>
 BluetoothRemoteGattCharacteristicChromeOS::GetDescriptors() const {
   std::vector<device::BluetoothGattDescriptor*> descriptors;
   for (DescriptorMap::const_iterator iter = descriptors_.begin();
        iter != descriptors_.end(); ++iter)
     descriptors.push_back(iter->second);
   return descriptors;
 }
 
+device::BluetoothGattDescriptor*
+BluetoothRemoteGattCharacteristicChromeOS::GetDescriptor(
+    const std::string& identifier) const {
+  DescriptorMap::const_iterator iter =
+      descriptors_.find(dbus::ObjectPath(identifier));
+  if (iter == descriptors_.end())
+    return NULL;
+  return iter->second;
+}
+
 bool BluetoothRemoteGattCharacteristicChromeOS::AddDescriptor(
     device::BluetoothGattDescriptor* descriptor) {
   VLOG(1) << "Descriptors cannot be added to a remote GATT characteristic.";
   return false;
 }
 
 bool BluetoothRemoteGattCharacteristicChromeOS::UpdateValue(
     const std::vector<uint8>& value) {
   VLOG(1) << "Cannot update the value of a remote GATT characteristic.";
   return false;
@@ skipping 60 matching lines @@
 
   VLOG(1) << "Adding new remote GATT descriptor for GATT characteristic: "
           << GetIdentifier() << ", UUID: " << GetUUID().canonical_value();
 
   BluetoothRemoteGattDescriptorChromeOS* descriptor =
       new BluetoothRemoteGattDescriptorChromeOS(this, object_path);
   descriptors_[object_path] = descriptor;
   DCHECK(descriptor->GetIdentifier() == object_path.value());
   DCHECK(descriptor->GetUUID().IsValid());
   DCHECK(service_);
+
+  service_->NotifyDescriptorAddedOrRemoved(this, descriptor, true /* added */);
   service_->NotifyServiceChanged();
 }
 
 void BluetoothRemoteGattCharacteristicChromeOS::GattDescriptorRemoved(
     const dbus::ObjectPath& object_path) {
   DescriptorMap::iterator iter = descriptors_.find(object_path);
   if (iter == descriptors_.end()) {
     VLOG(2) << "Unknown descriptor removed: " << object_path.value();
     return;
   }
 
   VLOG(1) << "Removing remote GATT descriptor from characteristic: "
           << GetIdentifier() << ", UUID: " << GetUUID().canonical_value();
 
   BluetoothRemoteGattDescriptorChromeOS* descriptor = iter->second;
   DCHECK(descriptor->object_path() == object_path);
   descriptors_.erase(iter);
+
+  service_->NotifyDescriptorAddedOrRemoved(this, descriptor, false /* added */);
   delete descriptor;
 
   DCHECK(service_);
+
   service_->NotifyServiceChanged();
 }
 
 void BluetoothRemoteGattCharacteristicChromeOS::GattDescriptorPropertyChanged(
     const dbus::ObjectPath& object_path,
     const std::string& property_name) {
   DescriptorMap::const_iterator iter = descriptors_.find(object_path);
   if (iter == descriptors_.end())
     return;
 
+  // Ignore all property changes except for "Value".
+  BluetoothGattDescriptorClient::Properties* properties =
+      DBusThreadManager::Get()->GetBluetoothGattDescriptorClient()->
+          GetProperties(object_path);
+  DCHECK(properties);
+  if (property_name != properties->value.name())
+    return;
+
   VLOG(1) << "GATT descriptor property changed: " << object_path.value()
           << ", property: " << property_name;
+
+  DCHECK(service_);
+
+  service_->NotifyDescriptorValueChanged(
+      this, iter->second, properties->value.value());
 }
 
 void BluetoothRemoteGattCharacteristicChromeOS::OnGetValue(
     const ValueCallback& callback,
     const ErrorCallback& error_callback,
     bool success) {
   if (!success) {
     VLOG(1) << "Failed to read the value from the remote characteristic.";
     error_callback.Run();
     return;
@@ skipping 15 matching lines @@
     VLOG(1) << "Failed to write the value of remote characteristic.";
     error_callback.Run();
     return;
   }
 
   VLOG(1) << "Wrote value of remote characteristic.";
   callback.Run();
 }
 
 }  // namespace chromeos