OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chromeos/network/network_sms_handler.h" | 5 #include "chromeos/network/network_sms_handler.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "chromeos/dbus/dbus_thread_manager.h" | 10 #include "chromeos/dbus/dbus_thread_manager.h" |
(...skipping 17 matching lines...) Expand all Loading... |
28 const char NetworkSmsHandler::kNumberKey[] = "number"; | 28 const char NetworkSmsHandler::kNumberKey[] = "number"; |
29 const char NetworkSmsHandler::kTextKey[] = "text"; | 29 const char NetworkSmsHandler::kTextKey[] = "text"; |
30 const char NetworkSmsHandler::kTimestampKey[] = "timestamp"; | 30 const char NetworkSmsHandler::kTimestampKey[] = "timestamp"; |
31 | 31 |
32 class NetworkSmsHandler::NetworkSmsDeviceHandler { | 32 class NetworkSmsHandler::NetworkSmsDeviceHandler { |
33 public: | 33 public: |
34 NetworkSmsDeviceHandler(NetworkSmsHandler* host, | 34 NetworkSmsDeviceHandler(NetworkSmsHandler* host, |
35 std::string dbus_connection, | 35 std::string dbus_connection, |
36 dbus::ObjectPath object_path); | 36 dbus::ObjectPath object_path); |
37 | 37 |
| 38 void RequestUpdate(); |
| 39 |
38 private: | 40 private: |
39 void ListCallback(const base::ListValue& message_list); | 41 void ListCallback(const base::ListValue& message_list); |
40 void SmsReceivedCallback(uint32 index, bool complete); | 42 void SmsReceivedCallback(uint32 index, bool complete); |
41 void GetCallback(uint32 index, const base::DictionaryValue& dictionary); | 43 void GetCallback(uint32 index, const base::DictionaryValue& dictionary); |
42 void DeleteMessages(); | 44 void DeleteMessages(); |
43 void NotifyMessageReceived(const base::DictionaryValue& dictionary); | 45 void NotifyMessageReceived(const base::DictionaryValue& dictionary); |
44 | 46 |
45 NetworkSmsHandler* host_; | 47 NetworkSmsHandler* host_; |
46 std::string dbus_connection_; | 48 std::string dbus_connection_; |
47 dbus::ObjectPath object_path_; | 49 dbus::ObjectPath object_path_; |
(...skipping 19 matching lines...) Expand all Loading... |
67 base::Bind(&NetworkSmsDeviceHandler::SmsReceivedCallback, | 69 base::Bind(&NetworkSmsDeviceHandler::SmsReceivedCallback, |
68 weak_ptr_factory_.GetWeakPtr())); | 70 weak_ptr_factory_.GetWeakPtr())); |
69 | 71 |
70 // List the existing messages. | 72 // List the existing messages. |
71 DBusThreadManager::Get()->GetGsmSMSClient()->List( | 73 DBusThreadManager::Get()->GetGsmSMSClient()->List( |
72 dbus_connection_, object_path_, | 74 dbus_connection_, object_path_, |
73 base::Bind(&NetworkSmsDeviceHandler::ListCallback, | 75 base::Bind(&NetworkSmsDeviceHandler::ListCallback, |
74 weak_ptr_factory_.GetWeakPtr())); | 76 weak_ptr_factory_.GetWeakPtr())); |
75 } | 77 } |
76 | 78 |
| 79 void NetworkSmsHandler::NetworkSmsDeviceHandler::RequestUpdate() { |
| 80 DBusThreadManager::Get()->GetGsmSMSClient()->RequestUpdate( |
| 81 dbus_connection_, object_path_); |
| 82 } |
| 83 |
77 void NetworkSmsHandler::NetworkSmsDeviceHandler::ListCallback( | 84 void NetworkSmsHandler::NetworkSmsDeviceHandler::ListCallback( |
78 const base::ListValue& message_list) { | 85 const base::ListValue& message_list) { |
79 // This receives all messages, so clear any pending deletes. | 86 // This receives all messages, so clear any pending deletes. |
80 delete_queue_.clear(); | 87 delete_queue_.clear(); |
81 for (base::ListValue::const_iterator iter = message_list.begin(); | 88 for (base::ListValue::const_iterator iter = message_list.begin(); |
82 iter != message_list.end(); ++iter) { | 89 iter != message_list.end(); ++iter) { |
83 base::DictionaryValue* message = NULL; | 90 base::DictionaryValue* message = NULL; |
84 if (!(*iter)->GetAsDictionary(&message)) | 91 if (!(*iter)->GetAsDictionary(&message)) |
85 continue; | 92 continue; |
86 NotifyMessageReceived(*message); | 93 NotifyMessageReceived(*message); |
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
144 NetworkSmsHandler::~NetworkSmsHandler() { | 151 NetworkSmsHandler::~NetworkSmsHandler() { |
145 } | 152 } |
146 | 153 |
147 void NetworkSmsHandler::Init() { | 154 void NetworkSmsHandler::Init() { |
148 // Request network manager properties so that we can get the list of devices. | 155 // Request network manager properties so that we can get the list of devices. |
149 DBusThreadManager::Get()->GetFlimflamManagerClient()->GetProperties( | 156 DBusThreadManager::Get()->GetFlimflamManagerClient()->GetProperties( |
150 base::Bind(&NetworkSmsHandler::ManagerPropertiesCallback, | 157 base::Bind(&NetworkSmsHandler::ManagerPropertiesCallback, |
151 weak_ptr_factory_.GetWeakPtr())); | 158 weak_ptr_factory_.GetWeakPtr())); |
152 } | 159 } |
153 | 160 |
| 161 void NetworkSmsHandler::RequestUpdate() { |
| 162 for (ScopedVector<NetworkSmsDeviceHandler>::iterator iter = |
| 163 device_handlers_.begin(); iter != device_handlers_.end(); ++iter) { |
| 164 (*iter)->RequestUpdate(); |
| 165 } |
| 166 } |
| 167 |
154 void NetworkSmsHandler::AddObserver(Observer* observer) { | 168 void NetworkSmsHandler::AddObserver(Observer* observer) { |
155 observers_.AddObserver(observer); | 169 observers_.AddObserver(observer); |
156 } | 170 } |
157 | 171 |
158 void NetworkSmsHandler::RemoveObserver(Observer* observer) { | 172 void NetworkSmsHandler::RemoveObserver(Observer* observer) { |
159 observers_.RemoveObserver(observer); | 173 observers_.RemoveObserver(observer); |
160 } | 174 } |
161 | 175 |
162 void NetworkSmsHandler::NotifyMessageReceived( | 176 void NetworkSmsHandler::NotifyMessageReceived( |
163 const base::DictionaryValue& message) { | 177 const base::DictionaryValue& message) { |
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
223 LOG(ERROR) << "Device has no DBusObject Property: " << device_path; | 237 LOG(ERROR) << "Device has no DBusObject Property: " << device_path; |
224 return; | 238 return; |
225 } | 239 } |
226 dbus::ObjectPath object_path(object_path_string); | 240 dbus::ObjectPath object_path(object_path_string); |
227 device_handlers_.push_back( | 241 device_handlers_.push_back( |
228 new NetworkSmsDeviceHandler(this, dbus_connection, object_path)); | 242 new NetworkSmsDeviceHandler(this, dbus_connection, object_path)); |
229 } | 243 } |
230 | 244 |
231 | 245 |
232 } // namespace chromeos | 246 } // namespace chromeos |
OLD | NEW |