diff --git a/sharing/certificates/fake_nearby_share_certificate_storage.cc b/sharing/certificates/fake_nearby_share_certificate_storage.cc index b168db61..8df195e4 100644 --- a/sharing/certificates/fake_nearby_share_certificate_storage.cc +++ b/sharing/certificates/fake_nearby_share_certificate_storage.cc @@ -117,15 +117,6 @@ void FakeNearbyShareCertificateStorage::ReplacePrivateCertificates( private_certificates.begin(), private_certificates.end()); } -void FakeNearbyShareCertificateStorage::ReplacePublicCertificates( - absl::Span public_certificates, - ResultCallback callback) { - replace_public_certificates_calls_.emplace_back( - std::vector(public_certificates.begin(), - public_certificates.end()), - std::move(callback)); -} - void FakeNearbyShareCertificateStorage::AddPublicCertificates( absl::Span public_certificates, ResultCallback callback) { diff --git a/sharing/certificates/fake_nearby_share_certificate_storage.h b/sharing/certificates/fake_nearby_share_certificate_storage.h index f3f1a98e..e52326b3 100644 --- a/sharing/certificates/fake_nearby_share_certificate_storage.h +++ b/sharing/certificates/fake_nearby_share_certificate_storage.h @@ -109,10 +109,6 @@ class FakeNearbyShareCertificateStorage : public NearbyShareCertificateStorage { void ReplacePrivateCertificates( absl::Span private_certificates) override; - void ReplacePublicCertificates( - absl::Span - public_certificates, - ResultCallback callback) override; void AddPublicCertificates( absl::Span public_certificates, @@ -128,11 +124,6 @@ class FakeNearbyShareCertificateStorage : public NearbyShareCertificateStorage { return get_public_certificates_callbacks_; } - std::vector& - replace_public_certificates_calls() { - return replace_public_certificates_calls_; - } - std::vector& add_public_certificates_calls() { return add_public_certificates_calls_; } @@ -162,7 +153,6 @@ class FakeNearbyShareCertificateStorage : public NearbyShareCertificateStorage { std::optional> private_certificates_; std::vector get_public_certificates_callbacks_; - std::vector replace_public_certificates_calls_; std::vector add_public_certificates_calls_; std::vector remove_expired_public_certificates_calls_; diff --git a/sharing/certificates/nearby_share_certificate_storage.h b/sharing/certificates/nearby_share_certificate_storage.h index 1003409f..c33c6e70 100644 --- a/sharing/certificates/nearby_share_certificate_storage.h +++ b/sharing/certificates/nearby_share_certificate_storage.h @@ -68,13 +68,6 @@ class NearbyShareCertificateStorage { virtual void ReplacePrivateCertificates( absl::Span private_certificates) = 0; - // Deletes existing public certificates and replaces them with - // |public_certificates|. - virtual void ReplacePublicCertificates( - absl::Span - public_certificates, - ResultCallback callback) = 0; - // Overwrites an existing record with |private_certificate| if that record // has the same ID . If no such record exists in storage, no action is taken. // This method is necessary for updating the private certificate's list of diff --git a/sharing/certificates/nearby_share_certificate_storage_impl.cc b/sharing/certificates/nearby_share_certificate_storage_impl.cc index 77ae5ceb..49b90f91 100644 --- a/sharing/certificates/nearby_share_certificate_storage_impl.cc +++ b/sharing/certificates/nearby_share_certificate_storage_impl.cc @@ -266,49 +266,6 @@ void NearbyShareCertificateStorageImpl::OnDatabaseDestroyed( std::move(callback)(true); } -void NearbyShareCertificateStorageImpl:: - ReplacePublicCertificatesDestroyCallback( - const std::vector& - new_certificates, - const ExpirationList& new_expirations, ResultCallback callback, - bool proceed) { - if (!proceed) { - std::move(callback)(false); - return; - } - - NL_VLOG(1) << __func__ << ": Inserting " << new_certificates.size() - << " public certificates."; - - public_certificate_database_->AddCertificates( - absl::MakeConstSpan(new_certificates), - [weak_this = weak_from_this(), new_expirations, - callback = std::move(callback)](bool success) { - if (auto storage = weak_this.lock()) { - storage->ReplacePublicCertificatesUpdateEntriesCallback( - std::make_unique(std::move(new_expirations)), - std::move(callback), success); - } - }); -} - -void NearbyShareCertificateStorageImpl:: - ReplacePublicCertificatesUpdateEntriesCallback( - std::unique_ptr expirations, ResultCallback callback, - bool proceed) { - if (!proceed) { - NL_LOG(ERROR) << __func__ << ": Failed to replace public certificates."; - std::move(callback)(false); - return; - } - NL_VLOG(1) << __func__ << ": Successfully replaced public certificates."; - - NL_CHECK(expirations); - public_certificate_expirations_.swap(*expirations); - SavePublicCertificateExpirations(); - std::move(callback)(true); -} - void NearbyShareCertificateStorageImpl::AddPublicCertificatesCallback( std::unique_ptr new_expirations, ResultCallback callback, bool proceed) { @@ -413,46 +370,6 @@ void NearbyShareCertificateStorageImpl::ReplacePrivateCertificates( prefs::kNearbySharingPrivateCertificateListName, list); } -void NearbyShareCertificateStorageImpl::ReplacePublicCertificates( - absl::Span - public_certificates, - ResultCallback callback) { - if (init_status_ == InitStatus::kFailed) { - std::move(callback)(false); - return; - } - - if (init_status_ == InitStatus::kUninitialized) { - deferred_callbacks_.push( - [this, public_certificates, callback = std::move(callback)]() { - ReplacePublicCertificates(public_certificates, std::move(callback)); - }); - - return; - } - - auto new_entries = std::vector(); - ExpirationList new_expirations; - for (const nearby::sharing::proto::PublicCertificate& cert : - public_certificates) { - new_entries.emplace_back(cert); - new_expirations.emplace_back(cert.secret_id(), - TimestampToTime(cert.end_time())); - } - std::sort(new_expirations.begin(), new_expirations.end(), SortBySecond); - - NL_VLOG(1) << __func__ << ": Clearing public certificate database."; - - public_certificate_database_->Destroy( - [weak_this = weak_from_this(), new_entries, new_expirations, - callback = std::move(callback)](bool success) { - if (auto storage = weak_this.lock()) { - storage->ReplacePublicCertificatesDestroyCallback( - new_entries, new_expirations, std::move(callback), success); - } - }); -} - void NearbyShareCertificateStorageImpl::AddPublicCertificates( absl::Span public_certificates, diff --git a/sharing/certificates/nearby_share_certificate_storage_impl.h b/sharing/certificates/nearby_share_certificate_storage_impl.h index 7b4ec90d..aa623c5b 100644 --- a/sharing/certificates/nearby_share_certificate_storage_impl.h +++ b/sharing/certificates/nearby_share_certificate_storage_impl.h @@ -81,10 +81,6 @@ class NearbyShareCertificateStorageImpl : public NearbyShareCertificateStorage, void ReplacePrivateCertificates( absl::Span private_certificates) override; - void ReplacePublicCertificates( - absl::Span - public_certificates, - ResultCallback callback) override; void AddPublicCertificates( absl::Span public_certificates, @@ -112,14 +108,6 @@ class NearbyShareCertificateStorageImpl : public NearbyShareCertificateStorage, void DestroyAndReinitialize(); - void ReplacePublicCertificatesDestroyCallback( - const std::vector& - new_certificates, - const ExpirationList& new_expirations, ResultCallback callback, - bool proceed); - void ReplacePublicCertificatesUpdateEntriesCallback( - std::unique_ptr expirations, ResultCallback callback, - bool proceed); void AddPublicCertificatesCallback( std::unique_ptr new_expirations, ResultCallback callback, bool proceed); diff --git a/sharing/certificates/nearby_share_certificate_storage_impl_test.cc b/sharing/certificates/nearby_share_certificate_storage_impl_test.cc index 2d2f5665..54c779fe 100644 --- a/sharing/certificates/nearby_share_certificate_storage_impl_test.cc +++ b/sharing/certificates/nearby_share_certificate_storage_impl_test.cc @@ -428,47 +428,6 @@ TEST_F(NearbyShareCertificateStorageImplTest, GetPublicCertificates) { EXPECT_THAT(cert_store.use_count(), Eq(1)); } -TEST_F(NearbyShareCertificateStorageImplTest, ReplacePublicCertificates) { - auto db = std::make_unique( - PrepopulatePublicCertificates()); - nearby::FakePublicCertificateDb* fake_db = db.get(); - std::vector new_certs = { - CreatePublicCertificate(kSecretId4, kSecretKey4, kPublicKey4, - kStartSeconds4, kStartNanos4, kEndSeconds4, - kEndNanos4, kForSelectedContacts4, - kMetadataEncryptionKey4, kEncryptedMetadataBytes4, - kMetadataEncryptionKeyTag4), - }; - auto cert_store = NearbyShareCertificateStorageImpl::Factory::Create( - preference_manager_, std::move(db)); - fake_db->InvokeInitStatusCallback(FakePublicCertificateDb::InitStatus::kOk); - - bool succeeded = false; - cert_store->ReplacePublicCertificates( - new_certs, [this, &succeeded](bool success) { - CaptureBoolCallback(&succeeded, success); - }); - fake_db->InvokeDestroyCallback(true); - fake_db->InvokeAddCallback(true); - - ASSERT_TRUE(succeeded); - auto cert_map = fake_db->GetCertificatesMap(); - ASSERT_EQ(cert_map.size(), 1u); - ASSERT_EQ(cert_map.count(kSecretId4), 1u); - auto& cert = cert_map.find(kSecretId4)->second; - EXPECT_EQ(cert.secret_key(), kSecretKey4); - EXPECT_EQ(cert.public_key(), kPublicKey4); - EXPECT_EQ(cert.start_time().seconds(), kStartSeconds4); - EXPECT_EQ(cert.start_time().nanos(), kStartNanos4); - EXPECT_EQ(cert.end_time().seconds(), kEndSeconds4); - EXPECT_EQ(cert.end_time().nanos(), kEndNanos4); - EXPECT_EQ(cert.for_selected_contacts(), kForSelectedContacts4); - EXPECT_EQ(cert.metadata_encryption_key(), kMetadataEncryptionKey4); - EXPECT_EQ(cert.encrypted_metadata_bytes(), kEncryptedMetadataBytes4); - EXPECT_EQ(cert.metadata_encryption_key_tag(), kMetadataEncryptionKeyTag4); - EXPECT_THAT(cert_store.use_count(), Eq(1)); -} - TEST_F(NearbyShareCertificateStorageImplTest, AddPublicCertificates) { auto db = std::make_unique( PrepopulatePublicCertificates());