summaryrefslogtreecommitdiffstats
path: root/chromium/device/nfc/nfc_adapter_chromeos.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/device/nfc/nfc_adapter_chromeos.cc')
-rw-r--r--chromium/device/nfc/nfc_adapter_chromeos.cc178
1 files changed, 135 insertions, 43 deletions
diff --git a/chromium/device/nfc/nfc_adapter_chromeos.cc b/chromium/device/nfc/nfc_adapter_chromeos.cc
index 071b0808ae9..374e8ac83e9 100644
--- a/chromium/device/nfc/nfc_adapter_chromeos.cc
+++ b/chromium/device/nfc/nfc_adapter_chromeos.cc
@@ -9,19 +9,25 @@
#include "base/callback.h"
#include "base/logging.h"
#include "chromeos/dbus/dbus_thread_manager.h"
-#include "device/nfc/nfc_peer.h"
-#include "device/nfc/nfc_tag.h"
+#include "device/nfc/nfc_peer_chromeos.h"
+#include "device/nfc/nfc_tag_chromeos.h"
#include "third_party/cros_system_api/dbus/service_constants.h"
namespace chromeos {
+namespace {
+
+typedef std::vector<dbus::ObjectPath> ObjectPathVector;
+
+} // namespace
+
NfcAdapterChromeOS::NfcAdapterChromeOS()
: weak_ptr_factory_(this) {
DBusThreadManager::Get()->GetNfcAdapterClient()->AddObserver(this);
DBusThreadManager::Get()->GetNfcDeviceClient()->AddObserver(this);
DBusThreadManager::Get()->GetNfcTagClient()->AddObserver(this);
- const std::vector<dbus::ObjectPath>& object_paths =
+ const ObjectPathVector& object_paths =
DBusThreadManager::Get()->GetNfcAdapterClient()->GetAdapters();
if (!object_paths.empty()) {
VLOG(1) << object_paths.size() << " NFC adapter(s) available.";
@@ -126,9 +132,9 @@ void NfcAdapterChromeOS::AdapterRemoved(const dbus::ObjectPath& object_path) {
// There may still be other adapters present on the system. Set the next
// available adapter as the current one.
- const std::vector<dbus::ObjectPath>& object_paths =
+ const ObjectPathVector& object_paths =
DBusThreadManager::Get()->GetNfcAdapterClient()->GetAdapters();
- for (std::vector<dbus::ObjectPath>::const_iterator iter =
+ for (ObjectPathVector::const_iterator iter =
object_paths.begin();
iter != object_paths.end(); ++iter) {
// The removed object will still be available until the call to
@@ -155,35 +161,91 @@ void NfcAdapterChromeOS::AdapterPropertyChanged(
}
void NfcAdapterChromeOS::DeviceAdded(const dbus::ObjectPath& object_path) {
+ if (!IsPresent())
+ return;
+
+ if (GetPeer(object_path.value()))
+ return;
+
VLOG(1) << "NFC device found: " << object_path.value();
- // TODO(armansito): Implement device logic.
+
+ // Check to see if the device belongs to this adapter.
+ const ObjectPathVector& devices =
+ DBusThreadManager::Get()->GetNfcDeviceClient()->
+ GetDevicesForAdapter(object_path_);
+ bool device_found = false;
+ for (ObjectPathVector::const_iterator iter = devices.begin();
+ iter != devices.end(); ++iter) {
+ if (*iter == object_path) {
+ device_found = true;
+ break;
+ }
+ }
+ if (!device_found) {
+ VLOG(1) << "Found peer device does not belong to the current adapter.";
+ return;
+ }
+
+ // Create the peer object.
+ NfcPeerChromeOS* peer_chromeos = new NfcPeerChromeOS(object_path);
+ SetPeer(object_path.value(), peer_chromeos);
+ FOR_EACH_OBSERVER(NfcAdapter::Observer, observers_,
+ PeerFound(this, peer_chromeos));
}
void NfcAdapterChromeOS::DeviceRemoved(const dbus::ObjectPath& object_path) {
VLOG(1) << "NFC device lost: " << object_path.value();
- // TODO(armansito): Implement device logic.
-}
-
-void NfcAdapterChromeOS::DevicePropertyChanged(
- const dbus::ObjectPath& object_path,
- const std::string& property_name) {
- // TODO(armansito): Implement device logic.
+ device::NfcPeer* peer = RemovePeer(object_path.value());
+ if (!peer) {
+ VLOG(1) << "Removed peer device does not belong to the current adapter.";
+ return;
+ }
+ FOR_EACH_OBSERVER(NfcAdapter::Observer, observers_, PeerLost(this, peer));
+ delete peer;
}
void NfcAdapterChromeOS::TagAdded(const dbus::ObjectPath& object_path) {
- VLOG(1) << "NFC tag found: " << object_path.value();
- // TODO(armansito): Implement tag logic.
-}
+ if (!IsPresent())
+ return;
+
+ if (GetTag(object_path.value()))
+ return;
-void NfcAdapterChromeOS::TagRemoved(const dbus::ObjectPath& object_path) {
VLOG(1) << "NFC tag found: " << object_path.value();
- // TODO(armansito): Implement tag logic.
+
+ // Check to see if the tag belongs to this adapter.
+ const std::vector<dbus::ObjectPath>& tags =
+ DBusThreadManager::Get()->GetNfcTagClient()->
+ GetTagsForAdapter(object_path_);
+ bool tag_found = false;
+ for (std::vector<dbus::ObjectPath>::const_iterator iter = tags.begin();
+ iter != tags.end(); ++iter) {
+ if (*iter == object_path) {
+ tag_found = true;
+ break;
+ }
+ }
+ if (!tag_found) {
+ VLOG(1) << "Found tag does not belong to the current adapter.";
+ return;
+ }
+
+ // Create the tag object.
+ NfcTagChromeOS* tag_chromeos = new NfcTagChromeOS(object_path);
+ SetTag(object_path.value(), tag_chromeos);
+ FOR_EACH_OBSERVER(NfcAdapter::Observer, observers_,
+ TagFound(this, tag_chromeos));
}
-void NfcAdapterChromeOS::TagPropertyChanged(
- const dbus::ObjectPath& object_path,
- const std::string& property_name) {
- // TODO(armansito): Implement tag logic.
+void NfcAdapterChromeOS::TagRemoved(const dbus::ObjectPath& object_path) {
+ VLOG(1) << "NFC tag lost : " << object_path.value();
+ device::NfcTag* tag = RemoveTag(object_path.value());
+ if (!tag) {
+ VLOG(1) << "Removed tag does not belong to the current adapter.";
+ return;
+ }
+ FOR_EACH_OBSERVER(NfcAdapter::Observer, observers_, TagLost(this, tag));
+ delete tag;
}
void NfcAdapterChromeOS::SetAdapter(const dbus::ObjectPath& object_path) {
@@ -200,9 +262,35 @@ void NfcAdapterChromeOS::SetAdapter(const dbus::ObjectPath& object_path) {
if (properties->polling.value())
PollingChanged(true);
- // TODO(armansito): Create device::NfcPeer and device::NfcTag instances for
- // all peers and tags that exist, once they have been implemented for
- // ChromeOS.
+ // Create peer objects for peers that were added before the adapter was set.
+ const ObjectPathVector& devices =
+ DBusThreadManager::Get()->GetNfcDeviceClient()->
+ GetDevicesForAdapter(object_path_);
+ for (ObjectPathVector::const_iterator iter = devices.begin();
+ iter != devices.end(); ++iter) {
+ const dbus::ObjectPath& object_path = *iter;
+ if (GetPeer(object_path.value()))
+ continue;
+ NfcPeerChromeOS* peer_chromeos = new NfcPeerChromeOS(object_path);
+ SetPeer(object_path.value(), peer_chromeos);
+ FOR_EACH_OBSERVER(NfcAdapter::Observer, observers_,
+ PeerFound(this, peer_chromeos));
+ }
+
+ // Create tag objects for tags that were added before the adapter was set.
+ const std::vector<dbus::ObjectPath>& tags =
+ DBusThreadManager::Get()->GetNfcTagClient()->
+ GetTagsForAdapter(object_path_);
+ for (std::vector<dbus::ObjectPath>::const_iterator iter = tags.begin();
+ iter != tags.end(); ++iter) {
+ const dbus::ObjectPath& object_path = *iter;
+ if (GetTag(object_path.value()))
+ continue;
+ NfcTagChromeOS* tag_chromeos = new NfcTagChromeOS(object_path);
+ SetTag(object_path.value(), tag_chromeos);
+ FOR_EACH_OBSERVER(NfcAdapter::Observer, observers_,
+ TagFound(this, tag_chromeos));
+ }
}
void NfcAdapterChromeOS::RemoveAdapter() {
@@ -219,22 +307,26 @@ void NfcAdapterChromeOS::RemoveAdapter() {
// Copy the tags and peers here and clear the original containers so that
// GetPeers and GetTags return no values during the *Removed observer calls.
- PeersMap peers = peers_;
- TagsMap tags = tags_;
- peers_.clear();
- tags_.clear();
-
- for (PeersMap::iterator iter = peers_.begin();
- iter != peers_.end(); ++iter) {
+ PeerList peers;
+ TagList tags;
+ GetPeers(&peers);
+ GetTags(&tags);
+ ClearPeers();
+ ClearTags();
+
+ for (PeerList::iterator iter = peers.begin();
+ iter != peers.end(); ++iter) {
+ device::NfcPeer* peer = *iter;
FOR_EACH_OBSERVER(NfcAdapter::Observer, observers_,
- PeerLost(this, iter->second));
- delete iter->second;
+ PeerLost(this, peer));
+ delete peer;
}
- for (TagsMap::iterator iter = tags_.begin();
- iter != tags_.end(); ++iter) {
+ for (TagList::iterator iter = tags.begin();
+ iter != tags.end(); ++iter) {
+ device::NfcTag* tag = *iter;
FOR_EACH_OBSERVER(NfcAdapter::Observer, observers_,
- TagLost(this, iter->second));
- delete iter->second;
+ TagLost(this, tag));
+ delete tag;
}
object_path_ = dbus::ObjectPath("");
@@ -270,7 +362,7 @@ void NfcAdapterChromeOS::OnSetPowered(const base::Closure& callback,
}
callback.Run();
} else {
- LOG(WARNING) << "Failed to power up the NFC antenna radio.";
+ LOG(ERROR) << "Failed to power up the NFC antenna radio.";
error_callback.Run();
}
}
@@ -283,8 +375,8 @@ void NfcAdapterChromeOS::OnStartPollingError(
const ErrorCallback& error_callback,
const std::string& error_name,
const std::string& error_message) {
- LOG(WARNING) << object_path_.value() << ": Failed to start polling: "
- << error_name << ": " << error_message;
+ LOG(ERROR) << object_path_.value() << ": Failed to start polling: "
+ << error_name << ": " << error_message;
error_callback.Run();
}
@@ -296,8 +388,8 @@ void NfcAdapterChromeOS::OnStopPollingError(
const ErrorCallback& error_callback,
const std::string& error_name,
const std::string& error_message) {
- LOG(WARNING) << object_path_.value() << ": Failed to stop polling: "
- << error_name << ": " << error_message;
+ LOG(ERROR) << object_path_.value() << ": Failed to stop polling: "
+ << error_name << ": " << error_message;
error_callback.Run();
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-07 15:57:35 +0000