diff --git a/internal/platform/BUILD b/internal/platform/BUILD index d4cc7490..0cf557f5 100644 --- a/internal/platform/BUILD +++ b/internal/platform/BUILD @@ -365,7 +365,6 @@ cc_library( "ble_v2.h", "bluetooth_adapter.h", "bluetooth_classic.h", - "credential_storage.h", "credential_storage_impl.h", "wifi.h", "wifi_hotspot.h", diff --git a/internal/platform/credential_storage.h b/internal/platform/credential_storage.h deleted file mode 100644 index 30d13136..00000000 --- a/internal/platform/credential_storage.h +++ /dev/null @@ -1,61 +0,0 @@ -// Copyright 2020 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef THIRD_PARTY_NEARBY_INTERNAL_PLATFORM_CREDENTIAL_STORAGE_H_ -#define THIRD_PARTY_NEARBY_INTERNAL_PLATFORM_CREDENTIAL_STORAGE_H_ - -#include -#include - -#include "absl/strings/string_view.h" -#include "internal/platform/implementation/credential_storage.h" -#include "internal/platform/implementation/platform.h" - -namespace location { -namespace nearby { - -/* - * The instance of CredentialStorage is owned by {@code CredentialManager}. - * It's a wrapper on top of implementation/credential_storage.h to providing - * credential storage operations for Nearby logic layer to invoke. - */ -class CredentialStorage { - public: - virtual ~CredentialStorage() = default; - - virtual void SaveCredentials( - absl::string_view manager_app_id, absl::string_view account_name, - const std::vector<::nearby::internal::PrivateCredential>& - private_credentials, - const std::vector<::nearby::internal::PublicCredential>& - public_credentials, - api::PublicCredentialType public_credential_type, - api::SaveCredentialsResultCallback callback) = 0; - - // Used to fetch private creds when broadcasting. - virtual void GetPrivateCredentials( - const api::CredentialSelector& credential_selector, - api::GetPrivateCredentialsResultCallback callback) = 0; - - // Used to fetch remote public creds when scanning. - virtual void GetPublicCredentials( - const api::CredentialSelector& credential_selector, - api::PublicCredentialType public_credential_type, - api::GetPublicCredentialsResultCallback callback) = 0; -}; - -} // namespace nearby -} // namespace location - -#endif // THIRD_PARTY_NEARBY_INTERNAL_PLATFORM_CREDENTIAL_STORAGE_H diff --git a/internal/platform/credential_storage_impl.h b/internal/platform/credential_storage_impl.h index 892e0bfa..cfe69985 100644 --- a/internal/platform/credential_storage_impl.h +++ b/internal/platform/credential_storage_impl.h @@ -19,7 +19,6 @@ #include #include "absl/strings/string_view.h" -#include "internal/platform/credential_storage.h" #include "internal/platform/implementation/credential_storage.h" #include "internal/platform/implementation/platform.h" @@ -31,7 +30,7 @@ namespace nearby { * It's a wrapper on top of implementation/credential_storage.h to providing * credential storage operations for Nearby logic layer to invoke. */ -class CredentialStorageImpl : public CredentialStorage { +class CredentialStorageImpl : public api::CredentialStorage { public: explicit CredentialStorageImpl() : impl_(api::ImplementationPlatform::CreateCredentialStorage()) {}