Nearby Presence/Implementation: Fix for Android compile

PiperOrigin-RevId: 468735587
This commit is contained in:
Anay Wadhera
2022-08-19 10:43:41 -07:00
committed by Copybara-Service
parent d92f1d4757
commit 5b7bb37d41
5 changed files with 10 additions and 9 deletions
@@ -139,7 +139,7 @@ bool BluetoothAdapter::SetName(absl::string_view name,
bool enabled;
{
absl::MutexLock lock(&mutex_);
name_ = name;
name_ = std::string(name);
enabled = enabled_;
mode = mode_;
}
@@ -111,7 +111,7 @@ AdvertisementDecoder::DecodeAdvertisement(absl::string_view advertisement) {
return elem.status();
}
if (elem->GetType() == DataElement::kSaltFieldType) {
salt = elem->GetValue();
salt = std::string(elem->GetValue());
}
bool need_decryption =
IsIdentity(elem->GetType()) && !elem->GetValue().empty();
@@ -14,6 +14,8 @@
#include "presence/implementation/base_broadcast_request.h"
#include <string>
#include "absl/strings/string_view.h"
#include "internal/platform/logging.h"
#include "presence/implementation/encryption.h"
@@ -27,7 +29,7 @@ BasePresenceRequestBuilder& BasePresenceRequestBuilder::SetSalt(
if (salt.size() != kSaltSize) {
NEARBY_LOG(WARNING, "Unsupported salt length: %d", salt.size());
} else {
salt_ = salt;
salt_ = std::string(salt);
}
return *this;
}
+2 -5
View File
@@ -18,14 +18,11 @@
#include <string>
#include <vector>
#include "net/proto2/util/public/message_differencer.h"
#include "absl/types/variant.h"
#include "internal/proto/credential.pb.h"
#include "presence/data_element.h"
#include "presence/power_mode.h"
using MD = proto2::util::MessageDifferencer;
namespace nearby {
namespace presence {
@@ -94,8 +91,8 @@ inline bool operator==(const LegacyPresenceScanFilter& a,
a.extended_properties != b.extended_properties)
return false;
for (int i = 0; i < a.remote_public_credentials.size(); ++i) {
if (!MD::Equivalent(a.remote_public_credentials[i],
b.remote_public_credentials[i]))
if (a.remote_public_credentials[i].SerializeAsString() !=
b.remote_public_credentials[i].SerializeAsString())
return false;
}
return true;
+3 -1
View File
@@ -13,8 +13,10 @@
// limitations under the License.
#include "presence/scan_request_builder.h"
#include <string>
#include <vector>
#include "absl/strings/string_view.h"
#include "absl/types/variant.h"
#include "presence/scan_request.h"
@@ -25,7 +27,7 @@ using ::nearby::internal::IdentityType;
ScanRequestBuilder& ScanRequestBuilder::SetAccountName(
absl::string_view account_name) {
request_.account_name = account_name;
request_.account_name = std::string(account_name);
return *this;
}