From 82947633d38e395774751e459f55089753d516e7 Mon Sep 17 00:00:00 2001 From: Francis Tsui Date: Tue, 3 Feb 2026 22:34:33 -0800 Subject: [PATCH] Fixes to meet styleguide. PiperOrigin-RevId: 865222108 --- sharing/BUILD | 2 + sharing/nearby_connections_service.cc | 25 ++++++++--- sharing/nearby_connections_service.h | 41 +++--------------- sharing/nearby_connections_service_impl.cc | 49 +++++++++++++++++----- sharing/nearby_connections_service_impl.h | 2 + sharing/nearby_connections_service_test.cc | 6 ++- 6 files changed, 71 insertions(+), 54 deletions(-) diff --git a/sharing/BUILD b/sharing/BUILD index 57344742..43f6618d 100644 --- a/sharing/BUILD +++ b/sharing/BUILD @@ -957,6 +957,8 @@ cc_test( deps = [ ":connection_types", ":nearby_sharing_service", + "//connections:core_types", + "//internal/platform:base", "//internal/platform:types", "//internal/platform/implementation:platform_impl", "@com_github_protobuf_matchers//protobuf-matchers", diff --git a/sharing/nearby_connections_service.cc b/sharing/nearby_connections_service.cc index 0e4214da..3d8f5799 100644 --- a/sharing/nearby_connections_service.cc +++ b/sharing/nearby_connections_service.cc @@ -21,7 +21,13 @@ #include #include +#include "connections/listeners.h" +#include "connections/payload.h" +#include "connections/payload_type.h" +#include "connections/status.h" +#include "connections/strategy.h" #include "internal/base/file_path.h" +#include "internal/platform/byte_array.h" #include "internal/platform/file.h" #include "sharing/internal/public/logging.h" #include "sharing/nearby_connections_types.h" @@ -29,19 +35,26 @@ namespace nearby { namespace sharing { +using ::nearby::connections::PayloadType; +using ::nearby::connections::ResultCallback; + +using NcPayload = ::nearby::connections::Payload; +using NcStatus = ::nearby::connections::Status; +using NcStrategy = ::nearby::connections::Strategy; + Status ConvertToStatus(NcStatus status) { return static_cast(status.value); } Payload ConvertToPayload(NcPayload payload) { switch (payload.GetType()) { - case NcPayloadType::kBytes: { - const NcByteArray& bytes = payload.AsBytes(); + case PayloadType::kBytes: { + const ByteArray& bytes = payload.AsBytes(); std::string data = std::string(bytes); return Payload(payload.GetId(), std::vector(data.begin(), data.end())); } - case NcPayloadType::kFile: { + case PayloadType::kFile: { std::string file_path = payload.AsFile()->GetFilePath(); std::string parent_folder = payload.GetParentFolder(); VLOG(1) << __func__ << ": Payload file_path=" << file_path @@ -71,16 +84,16 @@ NcPayload ConvertToServicePayload(Payload payload) { case PayloadContent::Type::kBytes: { std::vector bytes = payload.content.bytes_payload.bytes; return NcPayload(payload.id, - NcByteArray(std::string(bytes.begin(), bytes.end()))); + ByteArray(std::string(bytes.begin(), bytes.end()))); } default: return NcPayload(); } } -NcResultCallback BuildResultCallback( +ResultCallback BuildResultCallback( std::function callback) { - return NcResultCallback{[&, callback = std::move(callback)](NcStatus status) { + return ResultCallback{[&, callback = std::move(callback)](NcStatus status) { callback(ConvertToStatus(status)); }}; } diff --git a/sharing/nearby_connections_service.h b/sharing/nearby_connections_service.h index 08dfb20c..51a727fe 100644 --- a/sharing/nearby_connections_service.h +++ b/sharing/nearby_connections_service.h @@ -24,17 +24,8 @@ #include "absl/strings/string_view.h" #include "absl/types/span.h" -#include "connections/advertising_options.h" -#include "connections/connection_options.h" -#include "connections/core.h" -#include "connections/discovery_options.h" -#include "connections/implementation/service_controller_router.h" #include "connections/listeners.h" -#include "connections/medium_selector.h" -#include "connections/out_of_band_connection_metadata.h" -#include "connections/params.h" #include "connections/payload.h" -#include "connections/payload_type.h" #include "connections/status.h" #include "connections/strategy.h" #include "internal/platform/listeners.h" @@ -43,27 +34,6 @@ namespace nearby { namespace sharing { -using Core = ::nearby::connections::Core; -using ServiceControllerRouter = ::nearby::connections::ServiceControllerRouter; -using NcAdvertisingOptions = ::nearby::connections::AdvertisingOptions; -using NcByteArray = ::nearby::ByteArray; -using NcConnectionOptions = ::nearby::connections::ConnectionOptions; -using NcConnectionRequestInfo = ::nearby::connections::ConnectionRequestInfo; -using NcConnectionResponseInfo = ::nearby::connections::ConnectionResponseInfo; -using NcDistanceInfo = ::nearby::connections::DistanceInfo; -using NcDiscoveryListener = ::nearby::connections::DiscoveryListener; -using NcDiscoveryOptions = ::nearby::connections::DiscoveryOptions; -using NcMedium = ::nearby::connections::Medium; -using NcOutOfBandConnectionMetadata = - ::nearby::connections::OutOfBandConnectionMetadata; -using NcPayload = ::nearby::connections::Payload; -using NcPayloadType = ::nearby::connections::PayloadType; -using NcPayloadListener = ::nearby::connections::PayloadListener; -using NcPayloadProgressInfo = ::nearby::connections::PayloadProgressInfo; -using NcResultCallback = ::nearby::connections::ResultCallback; -using NcStatus = ::nearby::connections::Status; -using NcStrategy = ::nearby::connections::Strategy; - // Main interface to control the NearbyConnections library. Implemented in a // sandboxed process. This interface is used by the browser process to connect // to remote devices and send / receive raw data packets. Parsing of those @@ -71,7 +41,6 @@ using NcStrategy = ::nearby::connections::Strategy; // separate interface. class NearbyConnectionsService { public: - using HANDLE = void*; virtual ~NearbyConnectionsService() = default; struct ConnectionListener { @@ -171,12 +140,12 @@ class NearbyConnectionsService { virtual std::string Dump() const = 0; }; -Status ConvertToStatus(NcStatus status); -Payload ConvertToPayload(NcPayload payload); -NcPayload ConvertToServicePayload(Payload payload); -NcResultCallback BuildResultCallback( +Status ConvertToStatus(nearby::connections::Status status); +Payload ConvertToPayload(nearby::connections::Payload payload); +nearby::connections::Payload ConvertToServicePayload(Payload payload); +nearby::connections::ResultCallback BuildResultCallback( std::function callback); -NcStrategy ConvertToServiceStrategy(Strategy strategy); +nearby::connections::Strategy ConvertToServiceStrategy(Strategy strategy); } // namespace sharing } // namespace nearby diff --git a/sharing/nearby_connections_service_impl.cc b/sharing/nearby_connections_service_impl.cc index 58045704..7fec3154 100644 --- a/sharing/nearby_connections_service_impl.cc +++ b/sharing/nearby_connections_service_impl.cc @@ -27,10 +27,20 @@ #include "absl/strings/string_view.h" #include "absl/time/time.h" #include "absl/types/span.h" +#include "connections/advertising_options.h" +#include "connections/connection_options.h" +#include "connections/core.h" +#include "connections/discovery_options.h" +#include "connections/implementation/service_controller_router.h" #include "connections/listeners.h" #include "connections/medium_selector.h" +#include "connections/params.h" +#include "connections/payload.h" +#include "connections/payload_type.h" +#include "connections/status.h" #include "connections/strategy.h" #include "internal/analytics/event_logger.h" +#include "internal/platform/byte_array.h" #include "internal/platform/logging.h" #include "internal/platform/mac_address.h" #include "sharing/internal/public/connectivity_manager.h" @@ -41,7 +51,24 @@ namespace nearby { namespace sharing { namespace { -Core* GetService(NearbyConnectionsService::HANDLE handle) { +using ::nearby::connections::ConnectionRequestInfo; +using ::nearby::connections::ConnectionResponseInfo; +using ::nearby::connections::Core; +using ::nearby::connections::PayloadProgressInfo; +using ::nearby::connections::PayloadType; +using ::nearby::connections::ServiceControllerRouter; + +using NcAdvertisingOptions = ::nearby::connections::AdvertisingOptions; +using NcConnectionOptions = ::nearby::connections::ConnectionOptions; +using NcDiscoveryListener = ::nearby::connections::DiscoveryListener; +using NcDiscoveryOptions = ::nearby::connections::DiscoveryOptions; +using NcDistanceInfo = ::nearby::connections::DistanceInfo; +using NcMedium = ::nearby::connections::Medium; +using NcPayload = ::nearby::connections::Payload; +using NcPayloadListener = ::nearby::connections::PayloadListener; +using NcStatus = ::nearby::connections::Status; + +Core* GetService(NearbyConnectionsServiceImpl::HANDLE handle) { return reinterpret_cast(handle); } @@ -88,12 +115,12 @@ void NearbyConnectionsServiceImpl::StartAdvertising( options.fast_advertisement_service_uuid = advertising_options.fast_advertisement_service_uuid.uuid; - NcConnectionRequestInfo connection_request_info; + ConnectionRequestInfo connection_request_info; connection_request_info.endpoint_info = - NcByteArray(std::string(endpoint_info.begin(), endpoint_info.end())); + ByteArray(std::string(endpoint_info.begin(), endpoint_info.end())); connection_request_info.listener.initiated_cb = [&](const std::string& endpoint_id, - const NcConnectionResponseInfo& info) { + const ConnectionResponseInfo& info) { ConnectionInfo connection_info; connection_info.authentication_token = info.authentication_token; std::string remote_end_point = std::string(info.remote_endpoint_info); @@ -166,7 +193,7 @@ void NearbyConnectionsServiceImpl::StartDiscovery( NcDiscoveryListener listener; listener.endpoint_found_cb = [this](const std::string& endpoint_id, - const NcByteArray& endpoint_info, + const ByteArray& endpoint_info, const std::string& service_id) { std::string endpoint_info_data = std::string(endpoint_info); discovery_listener_.endpoint_found_cb( @@ -224,12 +251,12 @@ void NearbyConnectionsServiceImpl::RequestConnection( } options.non_disruptive_hotspot_mode = connection_options.non_disruptive_hotspot_mode; - NcConnectionRequestInfo connection_request_info; + ConnectionRequestInfo connection_request_info; connection_request_info.endpoint_info = - NcByteArray(std::string(endpoint_info.begin(), endpoint_info.end())); + ByteArray(std::string(endpoint_info.begin(), endpoint_info.end())); connection_request_info.listener.initiated_cb = [&](const std::string& endpoint_id, - const NcConnectionResponseInfo& info) { + const ConnectionResponseInfo& info) { ConnectionInfo connection_info; connection_info.authentication_token = info.authentication_token; std::string remote_end_point = std::string(info.remote_endpoint_info); @@ -312,8 +339,8 @@ void NearbyConnectionsServiceImpl::AcceptConnection( VLOG(1) << "payload callback id=" << payload.GetId(); switch (payload.GetType()) { - case NcPayloadType::kBytes: - case NcPayloadType::kFile: + case PayloadType::kBytes: + case PayloadType::kFile: payload_listener->second.payload_cb( endpoint_id, ConvertToPayload(std::move(payload))); break; @@ -324,7 +351,7 @@ void NearbyConnectionsServiceImpl::AcceptConnection( }, .payload_progress_cb = [&](absl::string_view endpoint_id, - const NcPayloadProgressInfo& info) { + const PayloadProgressInfo& info) { PayloadTransferUpdate transfer_update; transfer_update.bytes_transferred = info.bytes_transferred; transfer_update.payload_id = info.payload_id; diff --git a/sharing/nearby_connections_service_impl.h b/sharing/nearby_connections_service_impl.h index 2cb554d0..54bf1ab9 100644 --- a/sharing/nearby_connections_service_impl.h +++ b/sharing/nearby_connections_service_impl.h @@ -35,6 +35,8 @@ namespace sharing { class NearbyConnectionsServiceImpl : public NearbyConnectionsService { public: + using HANDLE = void*; + explicit NearbyConnectionsServiceImpl( nearby::ConnectivityManager* connectivity_manager, nearby::analytics::EventLogger* event_logger = nullptr); diff --git a/sharing/nearby_connections_service_test.cc b/sharing/nearby_connections_service_test.cc index 9a48fb42..816dc8b6 100644 --- a/sharing/nearby_connections_service_test.cc +++ b/sharing/nearby_connections_service_test.cc @@ -17,6 +17,8 @@ #include "gmock/gmock.h" #include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" +#include "connections/payload.h" +#include "internal/platform/byte_array.h" #include "internal/platform/file.h" #include "sharing/nearby_connections_types.h" @@ -25,8 +27,10 @@ namespace { using ::testing::Eq; +using NcPayload = ::nearby::connections::Payload; + TEST(NearbyConnectionSharingServicePayloadTest, ConvertBytesToPayload) { - Payload payload = ConvertToPayload(NcPayload(1234, NcByteArray("test"))); + Payload payload = ConvertToPayload(NcPayload(1234, ByteArray("test"))); EXPECT_THAT(payload.id, Eq(1234LL)); EXPECT_THAT(payload.content.type, Eq(PayloadContent::Type::kBytes)); }