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

Remove deprecated string aliases.

Browse Source 
PiperOrigin-RevId: 876303135
This commit is contained in:
Francis Tsui
2026-02-27 09:58:26 -08:00
committed by Copybara-Service
parent e5046f6b55
commit 1a543b0d7f
10 changed files with 83 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sharing/certificates/nearby_share_certificate_storage_impl.cc
+5 -5
View File
@@ -36,11 +36,11 @@
#include "sharing/certificates/constants.h"
#include "sharing/certificates/nearby_share_certificate_storage.h"
#include "sharing/certificates/nearby_share_private_certificate.h"
#include "sharing/common/nearby_share_prefs.h"
#include "sharing/internal/api/preference_manager.h"
#include "sharing/internal/api/private_certificate_data.h"
#include "sharing/internal/api/public_certificate_database.h"
#include "sharing/internal/public/logging.h"
#include "sharing/internal/public/pref_names.h"
#include "sharing/proto/rpc_resources.pb.h"
#include "sharing/proto/timestamp.pb.h"
@@ -350,7 +350,7 @@ std::vector<NearbySharePrivateCertificate>
NearbyShareCertificateStorageImpl::GetPrivateCertificates() {
std::vector<PrivateCertificateData> list =
preference_manager_.GetPrivateCertificateArray(
prefs::kNearbySharingPrivateCertificateListName);
PrefNames::kPrivateCertificateList);
std::vector<NearbySharePrivateCertificate> certs;
certs.reserve(list.size());
for (const PrivateCertificateData& cert_data : list) {
@@ -391,7 +391,7 @@ void NearbyShareCertificateStorageImpl::ReplacePrivateCertificates(
list.push_back(cert.ToCertificateData());
}
preference_manager_.SetPrivateCertificateArray(
prefs::kNearbySharingPrivateCertificateListName, list);
PrefNames::kPrivateCertificateList, list);
}
void NearbyShareCertificateStorageImpl::AddPublicCertificates(
@@ -504,7 +504,7 @@ void NearbyShareCertificateStorageImpl::ClearPublicCertificates(
bool NearbyShareCertificateStorageImpl::FetchPublicCertificateExpirations() {
std::vector<std::pair<std::string, int64_t>> expirations =
preference_manager_.GetCertificateExpirationArray(
prefs::kNearbySharingPublicCertificateExpirationDictName);
PrefNames::kPublicCertificateExpirationDict);
public_certificate_expirations_.clear();
if (expirations.empty()) {
return false;
@@ -535,7 +535,7 @@ void NearbyShareCertificateStorageImpl::SavePublicCertificateExpirations() {
}
preference_manager_.SetCertificateExpirationArray(
prefs::kNearbySharingPublicCertificateExpirationDictName, expirations);
PrefNames::kPublicCertificateExpirationDict, expirations);
}
} // namespace nearby::sharing
sharing/certificates/nearby_share_certificate_storage_impl_test.cc
+8 -12
View File
@@ -38,9 +38,9 @@
#include "sharing/certificates/nearby_share_certificate_storage.h"
#include "sharing/certificates/nearby_share_private_certificate.h"
#include "sharing/certificates/test_util.h"
#include "sharing/common/nearby_share_prefs.h"
#include "sharing/internal/api/mock_public_certificate_db.h"
#include "sharing/internal/api/private_certificate_data.h"
#include "sharing/internal/public/pref_names.h"
#include "sharing/internal/test/fake_preference_manager.h"
#include "sharing/internal/test/fake_public_certificate_db.h"
#include "sharing/proto/enums.pb.h"
@@ -153,10 +153,8 @@ class NearbyShareCertificateStorageImplTest : public ::testing::Test {
NearbyShareCertificateStorageImplTest&) = delete;
void SetUp() override {
preference_manager_.Remove(
prefs::kNearbySharingPublicCertificateExpirationDictName);
preference_manager_.Remove(
prefs::kNearbySharingPrivateCertificateListName);
preference_manager_.Remove(PrefNames::kPublicCertificateExpirationDict);
preference_manager_.Remove(PrefNames::kPrivateCertificateList);
}
std::map<std::string, PublicCertificate> PrepopulatePublicCertificates() {
@@ -185,8 +183,7 @@ class NearbyShareCertificateStorageImplTest : public ::testing::Test {
entries.emplace(cert.secret_id(), std::move(cert));
}
preference_manager_.SetCertificateExpirationArray(
prefs::kNearbySharingPublicCertificateExpirationDictName,
expirations);
PrefNames::kPublicCertificateExpirationDict, expirations);
return entries;
}
@@ -835,21 +832,20 @@ TEST_F(NearbyShareCertificateStorageImplTest,
std::vector<api::PrivateCertificateData> private_cert_data =
preference_manager_.GetPrivateCertificateArray(
prefs::kNearbySharingPrivateCertificateListName);
PrefNames::kPrivateCertificateList);
ASSERT_EQ(private_cert_data.size(), 3u);
// Set to invalid base64 encoded string.
private_cert_data[0].key_pair = "::..\\|@#";
preference_manager_.SetPrivateCertificateArray(
prefs::kNearbySharingPrivateCertificateListName, private_cert_data);
PrefNames::kPrivateCertificateList, private_cert_data);
std::vector<NearbySharePrivateCertificate> certs =
cert_store->GetPrivateCertificates();
// Verify corrupted cert has been removed.
EXPECT_TRUE(certs.empty());
private_cert_data =
preference_manager_.GetPrivateCertificateArray(
prefs::kNearbySharingPrivateCertificateListName);
private_cert_data = preference_manager_.GetPrivateCertificateArray(
PrefNames::kPrivateCertificateList);
EXPECT_TRUE(private_cert_data.empty());
}