[EasyUnlock] Add beacon_seeds to RemoteDevice.

components/cryptauth/remote_device.cc

 // Copyright 2015 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 "components/cryptauth/remote_device.h"
 
 #include "base/base64.h"
 
 namespace cryptauth {
 
 RemoteDevice::RemoteDevice() {}
 
 RemoteDevice::RemoteDevice(const std::string& user_id,
                            const std::string& name,
                            const std::string& public_key,
                            const std::string& bluetooth_address,
                            const std::string& persistent_symmetric_key,
                            std::string sign_in_challenge)
     : user_id(user_id),
       name(name),
       public_key(public_key),
       bluetooth_address(bluetooth_address),
       persistent_symmetric_key(persistent_symmetric_key),
       sign_in_challenge(sign_in_challenge) {}
 
 RemoteDevice::RemoteDevice(const RemoteDevice& other) = default;
 
 RemoteDevice::~RemoteDevice() {}
 
+void RemoteDevice::LoadBeaconSeeds(
+    const std::vector<BeaconSeed>& beacon_seeds) {
+  this->are_beacon_seeds_loaded = true;

[Ryan Hansberry, 2017/05/19 18:28:43]

nit: remove 'this'

[Tim Song, 2017/05/19 21:19:34]

This is to disambiguate the member variable of |beacon_seed| vs. the local
variable.

+  this->beacon_seeds = beacon_seeds;

[Ryan Hansberry, 2017/05/19 18:28:43]

same here

[Tim Song, 2017/05/19 21:19:34]

Same here.

+}
+
 std::string RemoteDevice::GetDeviceId() const {
   std::string to_return;
   base::Base64Encode(public_key, &to_return);
   return to_return;
 }
 
 std::string RemoteDevice::GetTruncatedDeviceIdForLogs() const {
   return RemoteDevice::TruncateDeviceIdForLogs(GetDeviceId());
 }
 
 bool RemoteDevice::operator==(const RemoteDevice& other) const {
-  return user_id == other.user_id
-      && name == other.name
-      && public_key == other.public_key
-      && bluetooth_address == other.bluetooth_address
-      && persistent_symmetric_key == other.persistent_symmetric_key
-      && sign_in_challenge == other.sign_in_challenge;
+  bool are_beacon_seeds_equal = false;
+  if (are_beacon_seeds_loaded) {

[Ryan Hansberry, 2017/05/19 18:28:43]

These nested ifs are tough to read. Can you break this up a bit? For instance,
you can start off with something like:

have_both_loaded_beacon_seeds = (are_beacon_seeds_loaded ==
other.are_beacon_seeds_loaded);

And then only iterate if have_both_loaded_beacon_seeds == true.

Perhaps also break out the BeaconSeed list comparison into its own method?

[Tim Song, 2017/05/19 21:19:34]

Done.

+    if (beacon_seeds.size() == other.beacon_seeds.size()) {
+      are_beacon_seeds_equal = true;
+      for (size_t i = 0; i < beacon_seeds.size(); ++i) {
+        const BeaconSeed& our_seed = beacon_seeds[i];
+        const BeaconSeed& their_seed = other.beacon_seeds[i];
+        if (our_seed.start_time_millis() != their_seed.start_time_millis() ||
+            our_seed.end_time_millis() != their_seed.end_time_millis() ||
+            our_seed.data() != their_seed.data()) {
+          are_beacon_seeds_equal = false;
+          break;
+        }
+      }
+    }
+  } else {
+    are_beacon_seeds_equal = !other.are_beacon_seeds_loaded;
+  }
+
+  return user_id == other.user_id && name == other.name &&
+         public_key == other.public_key &&
+         bluetooth_address == other.bluetooth_address &&
+         persistent_symmetric_key == other.persistent_symmetric_key &&
+         sign_in_challenge == other.sign_in_challenge && are_beacon_seeds_equal;
 }
 
 bool RemoteDevice::operator<(const RemoteDevice& other) const {
   // |public_key| is the only field guaranteed to be set and is also unique to
   // each RemoteDevice. However, since it can contain null bytes, use
   // GetDeviceId(), which cannot contain null bytes, to compare devices.
   return GetDeviceId().compare(other.GetDeviceId()) < 0;
 }
 
 // static
 std::string RemoteDevice::TruncateDeviceIdForLogs(const std::string& full_id) {
   if (full_id.length() <= 10) {
     return full_id;
   }
 
   return full_id.substr(0, 5)
       + "..."
       + full_id.substr(full_id.length() - 5, full_id.length());
 }
 
 }  // namespace cryptauth