cros: Remaining interfaces for DBUS biometrics client.

chromeos/dbus/biod/biod_client.cc

 // Copyright 2017 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 "chromeos/dbus/biod/biod_client.h"
 
 #include <stdint.h>
 
 #include "base/bind.h"
 #include "base/macros.h"
@@ skipping 81 matching lines @@
     dbus::MessageWriter writer(&method_call);
     writer.AppendString(biod::kBiometricsManagerInterface);
     writer.AppendString(biod::kBiometricsManagerBiometricTypeProperty);
 
     biod_proxy_->CallMethod(
         &method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
         base::Bind(&BiodClientImpl::OnRequestType,
                    weak_ptr_factory_.GetWeakPtr(), callback));
   }
 
+  void CancelEnrollSession(
+      const dbus::ObjectPath& enroll_session_path) override {
+    dbus::MethodCall method_call(biod::kEnrollSessionInterface,
+                                 biod::kEnrollSessionCancelMethod);
+
+    dbus::ObjectProxy* enroll_session_proxy =
+        bus_->GetObjectProxy(biod::kBiodServiceName, enroll_session_path);
+    enroll_session_proxy->CallMethod(
+        &method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
+        dbus::ObjectProxy::EmptyResponseCallback());
+  }
+
+  void EndAuthSession(const dbus::ObjectPath& auth_session_path) override {
+    dbus::MethodCall method_call(biod::kAuthSessionInterface,
+                                 biod::kAuthSessionEndMethod);
+
+    dbus::ObjectProxy* auth_session_proxy =
+        bus_->GetObjectProxy(biod::kBiodServiceName, auth_session_path);
+    auth_session_proxy->CallMethod(&method_call,
+                                   dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
+                                   dbus::ObjectProxy::EmptyResponseCallback());
+  }
+
+  void SetRecordLabel(const dbus::ObjectPath& record_path,
+                      const std::string& label) override {
+    dbus::MethodCall method_call(biod::kRecordInterface,
+                                 biod::kRecordSetLabelMethod);
+    dbus::MessageWriter writer(&method_call);
+    writer.AppendString(label);
+
+    dbus::ObjectProxy* record_proxy =
+        bus_->GetObjectProxy(biod::kBiodServiceName, record_path);
+    record_proxy->CallMethod(&method_call,
+                             dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
+                             dbus::ObjectProxy::EmptyResponseCallback());
+  }
+
+  void RemoveRecord(const dbus::ObjectPath& record_path) override {
+    dbus::MethodCall method_call(biod::kRecordInterface,
+                                 biod::kRecordRemoveMethod);
+
+    dbus::ObjectProxy* record_proxy =
+        bus_->GetObjectProxy(biod::kBiodServiceName, record_path);
+    record_proxy->CallMethod(&method_call,
+                             dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
+                             dbus::ObjectProxy::EmptyResponseCallback());
+  }
+
+  void RequestRecordLabel(const dbus::ObjectPath& record_path,
+                          const LabelCallback& callback) override {
+    dbus::MethodCall method_call(dbus::kDBusPropertiesInterface,
+                                 dbus::kDBusPropertiesGet);
+    dbus::MessageWriter writer(&method_call);
+    writer.AppendString(biod::kRecordInterface);
+    writer.AppendString(biod::kRecordLabelProperty);
+
+    dbus::ObjectProxy* record_proxy =
+        bus_->GetObjectProxy(biod::kBiodServiceName, record_path);
+    record_proxy->CallMethod(
+        &method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
+        base::Bind(&BiodClientImpl::OnRequestRecordLabel,
+                   weak_ptr_factory_.GetWeakPtr(), callback));
+  }
+
  protected:
   void Init(dbus::Bus* bus) override {
+    bus_ = bus;
+
     biod_proxy_ = bus->GetObjectProxy(biod::kBiodServiceName,
                                       dbus::ObjectPath(biod::kBiodServicePath));
 
     biod_proxy_->SetNameOwnerChangedCallback(
         base::Bind(&BiodClientImpl::NameOwnerChangedReceived,
                    weak_ptr_factory_.GetWeakPtr()));
 
     biod_proxy_->ConnectToSignal(
         biod::kBiometricsManagerInterface,
         biod::kBiometricsManagerEnrollScanDoneSignal,
@@ skipping 70 matching lines @@
       dbus::MessageReader reader(response);
       if (!reader.PopVariantOfUint32(&result)) {
         LOG(ERROR) << biod::kBiometricsManagerBiometricTypeProperty
                    << " had incorrect response.";
       }
     }
 
     callback.Run(static_cast<biod::BiometricType>(result));
   }
 
+  void OnRequestRecordLabel(const LabelCallback& callback,
+                            dbus::Response* response) {
+    std::string result;
+    if (response) {
+      dbus::MessageReader reader(response);
+      if (!reader.PopString(&result))
+        LOG(ERROR) << biod::kRecordLabelProperty << " had incorrect response.";
+    }
+
+    callback.Run(result);
+  }
+
   // Called when the biometrics signal is initially connected.
   void OnSignalConnected(const std::string& interface_name,
                          const std::string& signal_name,
                          bool success) {
     LOG_IF(ERROR, !success)
         << "Failed to connect to biometrics signal: " << signal_name;
   }
 
   void NameOwnerChangedReceived(const std::string& /* old_owner */,
                                 const std::string& new_owner) {
@@ skipping 51 matching lines @@
       observer.BiodAuthScanDoneReceived(
           static_cast<biod::ScanResult>(scan_result), matches);
     }
   }
 
   void SessionFailedReceived(dbus::Signal* signal) {
     for (auto& observer : observers_)
       observer.BiodSessionFailedReceived();
   }
 
+  dbus::Bus* bus_;

[Daniel Erat, 2017/04/03 19:58:18]

nit: add " = nullptr;" here

[sammiequon, 2017/04/03 21:35:09]

Done.

   dbus::ObjectProxy* biod_proxy_;

[Daniel Erat, 2017/04/03 19:58:18]

and here (you'll need to remove initialization from the c'tor)

[sammiequon, 2017/04/03 21:35:09]

Done.

   base::ObserverList<Observer> observers_;
 
   // Note: This should remain the last member so it'll be destroyed and
   // invalidate its weak pointers before any other members are destroyed.
   base::WeakPtrFactory<BiodClientImpl> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(BiodClientImpl);
 };
 
 BiodClient::BiodClient() {}
 
 BiodClient::~BiodClient() {}
 
 // static
 BiodClient* BiodClient::Create(DBusClientImplementationType /* type */) {
   return new BiodClientImpl();
 }
 
 }  // namespace chromeos