TySS-Dev/nearby
1
0
Fork 0
mirror of https://github.com/kidfromjupiter/nearby.git synced 2026-09-16 15:36:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Nearby Presence/Implementation: Fix for Android compile

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files
presence/implementation/advertisement_decoder.cc
+1 -1
View File
@@ -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();
presence/implementation/base_broadcast_request.cc
+3 -1
View File
@@ -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;
}