Support the ModemManager1 interfaces for SMS messages

chromeos/dbus/sms_client.cc

Index: chromeos/dbus/sms_client.cc
diff --git a/chromeos/dbus/sms_client.cc b/chromeos/dbus/sms_client.cc
new file mode 100644
index 0000000000000000000000000000000000000000..cd47a68082cfd13f2850eefd7089f9b7e7195460
--- /dev/null
+++ b/chromeos/dbus/sms_client.cc
@@ -0,0 +1,131 @@
+// Copyright (c) 2012 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/sms_client.h"
+
+#include <map>
+#include <utility>
+
+#include "base/bind.h"
+#include "base/memory/scoped_ptr.h"
+#include "base/memory/weak_ptr.h"
+#include "base/message_loop.h"
+#include "base/stringprintf.h"
+#include "base/stl_util.h"
+#include "base/values.h"
+#include "dbus/bus.h"
+#include "dbus/message.h"
+#include "dbus/object_proxy.h"
+#include "dbus/values_util.h"
+#include "third_party/cros_system_api/dbus/service_constants.h"
+
+namespace chromeos {
+
+namespace {
+
+// SMSClient is used to communicate with the
+// org.freedesktop.ModemManager1.SMS service.  All methods should be
+// called from the origin thread (UI thread) which initializes the
+// DBusThreadManager instance.
+class SMSClientImpl : public SMSClient {
+ public:
+  explicit SMSClientImpl(dbus::Bus* bus) : bus_(bus), weak_ptr_factory_(this) {}
+  virtual ~SMSClientImpl() {}
+
+  // Calls GetAll method.  |callback| is called after the method call succeeds.
+  virtual void GetAll(const std::string& service_name,
+                      const dbus::ObjectPath& object_path,
+                      const GetAllCallback& callback) OVERRIDE {
+    dbus::ObjectProxy *proxy = bus_->GetObjectProxy(service_name, object_path);
+    dbus::MethodCall method_call(dbus::kDBusPropertiesInterface,
+                                 dbus::kDBusPropertiesGetAll);
+    dbus::MessageWriter writer(&method_call);
+    writer.AppendString(modemmanager::kModemManager1SmsInterface);
+    proxy->CallMethod(&method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
+                       base::Bind(&SMSClientImpl::OnGetAll,
+                                  weak_ptr_factory_.GetWeakPtr(),
+                                  callback));
+  }
+
+ private:
+  // Handles responses of GetAll method calls.
+  void OnGetAll(const GetAllCallback& callback, dbus::Response* response) {
+    if (!response) {
+      // Must invoke the callback, even if there is no message.
+      callback.Run(base::DictionaryValue());
+      return;
+    }
+    dbus::MessageReader reader(response);
+    scoped_ptr<base::Value> value(dbus::PopDataAsValue(&reader));
+    base::DictionaryValue* dictionary_value = NULL;
+    if (!value.get() || !value->GetAsDictionary(&dictionary_value)) {
+      LOG(WARNING) << "Invalid response: " << response->ToString();
+      callback.Run(base::DictionaryValue());
+      return;
+    }
+    callback.Run(*dictionary_value);
+  }
+
+  dbus::Bus* bus_;
+  base::WeakPtrFactory<SMSClientImpl> weak_ptr_factory_;
+
+  DISALLOW_COPY_AND_ASSIGN(SMSClientImpl);
+};
+
+class SMSClientStubImpl : public SMSClient {
+ public:
+  SMSClientStubImpl() : weak_ptr_factory_(this) {}
+  virtual ~SMSClientStubImpl() {}
+
+  virtual void GetAll(const std::string& service_name,
+                      const dbus::ObjectPath& object_path,
+                      const GetAllCallback& callback) OVERRIDE {
+    // Ownership passed to callback
+    base::DictionaryValue *sms = new base::DictionaryValue();
+    sms->SetString("Number", "000-000-0000");
+    sms->SetString("Text",
+                   "SMSClientStubImpl: Test Message: " + object_path.value());
+    sms->SetString("Timestamp", "Fri Jun  8 13:26:04 EDT 2012");
+
+    // Run callback asynchronously.
+    MessageLoop::current()->PostTask(
+        FROM_HERE,
+        base::Bind(&SMSClientStubImpl::OnGetAll,
+                   weak_ptr_factory_.GetWeakPtr(),
+                   base::Unretained(sms),

[hashimoto, 2012/06/11 07:45:46]

nit: Use base::Owned?

[Jason Glasgow, 2012/06/11 16:44:47]

Done.

+                   callback));
+  }
+
+ private:
+  void OnGetAll(base::DictionaryValue *sms,
+                const GetAllCallback& callback) {
+    callback.Run(*sms);
+    delete sms;

[Jason Glasgow, 2012/06/11 16:44:47]

Removed to be consistent with Owned.

+  }
+
+  base::WeakPtrFactory<SMSClientStubImpl> weak_ptr_factory_;
+
+  DISALLOW_COPY_AND_ASSIGN(SMSClientStubImpl);
+};
+
+}  // namespace
+
+////////////////////////////////////////////////////////////////////////////////
+// SMSClient
+
+SMSClient::SMSClient() {}
+
+SMSClient::~SMSClient() {}
+
+
+// static
+SMSClient* SMSClient::Create(DBusClientImplementationType type,
+                             dbus::Bus* bus) {
+  if (type == REAL_DBUS_CLIENT_IMPLEMENTATION) {
+    return new SMSClientImpl(bus);
+  }
+  DCHECK_EQ(STUB_DBUS_CLIENT_IMPLEMENTATION, type);
+  return new SMSClientStubImpl();
+}
+
+}  // namespace chromeos