From 334ef7a3e1264f5175cd8e857cd25254124c0838 Mon Sep 17 00:00:00 2001
From: Edwin Wu <edwinwu@google.com>
Date: Wed, 5 Jun 2024 05:23:52 -0700
Subject: [PATCH] [JNI] Refactor Payload and PayloadId/PayloadType

PiperOrigin-RevId: 640490438
---
 connections/payload.cc                     | 16 ++++++++--------
 connections/payload_type.h                 |  2 --
 sharing/nearby_connections_service_impl.cc |  1 +
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/connections/payload.cc b/connections/payload.cc
index 1f750f1a..c92d38e5 100644
--- a/connections/payload.cc
+++ b/connections/payload.cc
@@ -34,7 +34,7 @@ namespace connections {
 
 namespace {
 
-std::string getFileName(const std::string& s) {
+std::string FormatFileName(const std::string& s) {
   std::string s_copy(s);
   std::replace(s_copy.begin(), s_copy.end(), '\\',
                '/');  // replace all '\\' to '/'
@@ -66,13 +66,7 @@ Payload::Payload(const ByteArray& bytes)
 
 Payload::Payload(InputFile input_file)
     : id_(std::hash<std::string>()(input_file.GetFilePath())),
-      file_name_(getFileName(input_file.GetFilePath())),
-      type_(PayloadType::kFile),
-      content_(std::move(input_file)) {}
-
-Payload::Payload(Id id, InputFile input_file)
-    : id_(id),
-      file_name_(getFileName(input_file.GetFilePath())),
+      file_name_(FormatFileName(input_file.GetFilePath())),
       type_(PayloadType::kFile),
       content_(std::move(input_file)) {}
 
@@ -94,6 +88,12 @@ Payload::Payload(Id id, ByteArray&& bytes)
 Payload::Payload(Id id, const ByteArray& bytes)
     : id_(id), type_(PayloadType::kBytes), content_(bytes) {}
 
+Payload::Payload(Id id, InputFile input_file)
+    : id_(id),
+      file_name_(FormatFileName(input_file.GetFilePath())),
+      type_(PayloadType::kFile),
+      content_(std::move(input_file)) {}
+
 Payload::Payload(Id id, std::string parent_folder, std::string file_name,
                  InputFile input_file)
     : id_(id),
diff --git a/connections/payload_type.h b/connections/payload_type.h
index 47924e17..fd09a104 100644
--- a/connections/payload_type.h
+++ b/connections/payload_type.h
@@ -18,8 +18,6 @@
 namespace nearby {
 namespace connections {
 
-// TODO(edwinwu) : re-number kFile(3->2) and kStream(2->3) to align with Android
-// platform. Need to test for other platforms handled this to avoid side effect.
 enum class PayloadType { kUnknown = 0, kBytes = 1, kFile = 2, kStream = 3 };
 enum PayloadDirection {
   UNKNOWN_DIRECTION_PAYLOAD = 0,
diff --git a/sharing/nearby_connections_service_impl.cc b/sharing/nearby_connections_service_impl.cc
index 9103d621..ec9eb330 100644
--- a/sharing/nearby_connections_service_impl.cc
+++ b/sharing/nearby_connections_service_impl.cc
@@ -34,6 +34,7 @@
 #include "connections/payload.h"
 #include "connections/strategy.h"
 #include "internal/analytics/event_logger.h"
+#include "internal/platform/logging.h"
 #include "sharing/nearby_connections_service.h"
 #include "sharing/nearby_connections_types.h"