Index: components/cryptauth/remote_device.cc |
diff --git a/components/cryptauth/remote_device.cc b/components/cryptauth/remote_device.cc |
index 2787438a6059e068728ab8494d318d9e3f7e1a4f..386ea6712b27197cc3870cf9319fd20647ea3538 100644 |
--- a/components/cryptauth/remote_device.cc |
+++ b/components/cryptauth/remote_device.cc |
@@ -30,28 +30,34 @@ RemoteDevice::RemoteDevice(const RemoteDevice& other) = default; |
RemoteDevice::~RemoteDevice() {} |
std::string RemoteDevice::GetDeviceId() const { |
- std::string to_return; |
- base::Base64Encode(public_key, &to_return); |
- return to_return; |
+ std::string to_return; |
+ base::Base64Encode(public_key, &to_return); |
+ return to_return; |
} |
std::string RemoteDevice::GetTruncatedDeviceIdForLogs() const { |
- std::string id = GetDeviceId(); |
- if (id.length() <= 10) { |
- return id; |
- } |
- |
- return id.substr(0, 5) + "..." + id.substr(id.length() - 5, id.length()); |
+ 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_type == other.bluetooth_type |
- && bluetooth_address == other.bluetooth_address |
- && persistent_symmetric_key == other.persistent_symmetric_key |
- && sign_in_challenge == other.sign_in_challenge; |
+ return user_id == other.user_id |
+ && name == other.name |
+ && public_key == other.public_key |
+ && bluetooth_type == other.bluetooth_type |
+ && bluetooth_address == other.bluetooth_address |
+ && persistent_symmetric_key == other.persistent_symmetric_key |
+ && sign_in_challenge == other.sign_in_challenge; |
+} |
+ |
+// 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 |