commit c64fe5e866c5f97a5e5676b28931bc9f6d81946a
author Darin Petkov <petkov@chromium.org> Wed Jan 11 12:46:13 2012 +0100
committer Gerrit <chrome-bot@google.com> Wed Jan 11 08:47:53 2012 -0800
tree 65de356480d8b9f3bd72a69164609594d46fe66c
parent 58a577b23de1478a72135410d146625ffd00e909

shill: Make all device *PIN service methods asynchronous.

BUG=chromium-os:24955
TEST=unit tests

Change-Id: Id7bb736e4d18331440fa6652726f694d01d46a42
Reviewed-on: https://gerrit.chromium.org/gerrit/13977
Tested-by: Darin Petkov <petkov@chromium.org>
Reviewed-by: Eric Shienbrood <ers@chromium.org>
Commit-Ready: Darin Petkov <petkov@chromium.org>

cellular_capability_gsm.cc

diff --git a/cellular_capability_gsm.cc b/cellular_capability_gsm.cc
index e226f76..6fb10aa 100644
--- a/cellular_capability_gsm.cc
+++ b/cellular_capability_gsm.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -321,18 +321,26 @@
 }
 
 void CellularCapabilityGSM::RequirePIN(
-    const string &pin, bool require, Error */*error*/) {
-  VLOG(2) << __func__ << "(" << pin << ", " << require << ")";
+    const string &pin, bool require, ReturnerInterface *returner) {
+  VLOG(2) << __func__ << "(" << returner << ")";
   // Defer because we may be in a dbus-c++ callback.
   dispatcher()->PostTask(
       task_factory_.NewRunnableMethod(
-          &CellularCapabilityGSM::RequirePINTask, pin, require));
+          &CellularCapabilityGSM::RequirePINTask, pin, require, returner));
 }
 
-void CellularCapabilityGSM::RequirePINTask(const string &pin, bool require) {
-  VLOG(2) << __func__ << "(" << pin << ", " << require << ")";
+void CellularCapabilityGSM::RequirePINTask(
+    const string &pin, bool require, ReturnerInterface *returner) {
+  VLOG(2) << __func__ << "(" << returner << ")";
   // TODO(petkov): Switch to asynchronous calls (crosbug.com/17583).
-  card_proxy_->EnablePIN(pin, require);
+  try {
+    card_proxy_->EnablePIN(pin, require);
+  } catch (DBus::Error e) {
+    LOG(ERROR) << "EnablePIN failed: " << e.name() << "/" << e.message();
+    returner->ReturnError(Error(Error::kInternalError));
+    return;
+  }
+  returner->Return();
 }
 
 void CellularCapabilityGSM::EnterPIN(const string &pin,
@@ -358,36 +366,52 @@
   returner->Return();
 }
 
-void CellularCapabilityGSM::UnblockPIN(
-    const string &unblock_code, const string &pin, Error */*error*/) {
-  VLOG(2) << __func__ << "(" << unblock_code << ", " << pin << ")";
+void CellularCapabilityGSM::UnblockPIN(const string &unblock_code,
+                                       const string &pin,
+                                       ReturnerInterface *returner) {
+  VLOG(2) << __func__ << "(" << returner << ")";
   // Defer because we may be in a dbus-c++ callback.
   dispatcher()->PostTask(
       task_factory_.NewRunnableMethod(
-          &CellularCapabilityGSM::UnblockPINTask, unblock_code, pin));
+          &CellularCapabilityGSM::UnblockPINTask, unblock_code, pin, returner));
 }
 
-void CellularCapabilityGSM::UnblockPINTask(
-    const string &unblock_code, const string &pin) {
-  VLOG(2) << __func__ << "(" << unblock_code << ", " << pin << ")";
+void CellularCapabilityGSM::UnblockPINTask(const string &unblock_code,
+                                           const string &pin,
+                                           ReturnerInterface *returner) {
+  VLOG(2) << __func__ << "(" << returner << ")";
   // TODO(petkov): Switch to asynchronous calls (crosbug.com/17583).
-  card_proxy_->SendPUK(unblock_code, pin);
+  try {
+    card_proxy_->SendPUK(unblock_code, pin);
+  } catch (DBus::Error e) {
+    LOG(ERROR) << "SendPUK failed: " << e.name() << "/" << e.message();
+    returner->ReturnError(Error(Error::kInternalError));
+    return;
+  }
+  returner->Return();
 }
 
 void CellularCapabilityGSM::ChangePIN(
-    const string &old_pin, const string &new_pin, Error */*error*/) {
-  VLOG(2) << __func__ << "(" << old_pin << ", " << new_pin << ")";
+    const string &old_pin, const string &new_pin, ReturnerInterface *returner) {
+  VLOG(2) << __func__ << "(" << returner << ")";
   // Defer because we may be in a dbus-c++ callback.
   dispatcher()->PostTask(
       task_factory_.NewRunnableMethod(
-          &CellularCapabilityGSM::ChangePINTask, old_pin, new_pin));
+          &CellularCapabilityGSM::ChangePINTask, old_pin, new_pin, returner));
 }
 
 void CellularCapabilityGSM::ChangePINTask(
-    const string &old_pin, const string &new_pin) {
-  VLOG(2) << __func__ << "(" << old_pin << ", " << new_pin << ")";
+    const string &old_pin, const string &new_pin, ReturnerInterface *returner) {
+  VLOG(2) << __func__ << "(" << returner << ")";
   // TODO(petkov): Switch to asynchronous calls (crosbug.com/17583).
-  card_proxy_->ChangePIN(old_pin, new_pin);
+  try {
+    card_proxy_->ChangePIN(old_pin, new_pin);
+  } catch (DBus::Error e) {
+    LOG(ERROR) << "ChangePIN failed: " << e.name() << "/" << e.message();
+    returner->ReturnError(Error(Error::kInternalError));
+    return;
+  }
+  returner->Return();
 }
 
 void CellularCapabilityGSM::Scan(Error */*error*/) {