Commit 281d3753 authored by khorimoto's avatar khorimoto Committed by Commit bot

[CrOS Tether] Add a static TruncateDeviceIdForLogs() function.

BUG=672263

Review-Url: https://codereview.chromium.org/2590713002
Cr-Commit-Position: refs/heads/master@{#439730}
parent 996b83c7
...@@ -36,12 +36,7 @@ std::string RemoteDevice::GetDeviceId() const { ...@@ -36,12 +36,7 @@ std::string RemoteDevice::GetDeviceId() const {
} }
std::string RemoteDevice::GetTruncatedDeviceIdForLogs() const { std::string RemoteDevice::GetTruncatedDeviceIdForLogs() const {
std::string id = GetDeviceId(); return RemoteDevice::TruncateDeviceIdForLogs(GetDeviceId());
if (id.length() <= 10) {
return id;
}
return id.substr(0, 5) + "..." + id.substr(id.length() - 5, id.length());
} }
bool RemoteDevice::operator==(const RemoteDevice& other) const { bool RemoteDevice::operator==(const RemoteDevice& other) const {
...@@ -54,4 +49,15 @@ bool RemoteDevice::operator==(const RemoteDevice& other) const { ...@@ -54,4 +49,15 @@ bool RemoteDevice::operator==(const RemoteDevice& other) const {
&& sign_in_challenge == other.sign_in_challenge; && 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 } // namespace cryptauth
...@@ -42,6 +42,9 @@ struct RemoteDevice { ...@@ -42,6 +42,9 @@ struct RemoteDevice {
std::string GetTruncatedDeviceIdForLogs() const; std::string GetTruncatedDeviceIdForLogs() const;
bool operator==(const RemoteDevice& other) const; bool operator==(const RemoteDevice& other) const;
// Static method for truncated device ID for logs.
static std::string TruncateDeviceIdForLogs(const std::string& full_id);
}; };
typedef std::vector<RemoteDevice> RemoteDeviceList; typedef std::vector<RemoteDevice> RemoteDeviceList;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment