From 4f30d1e5380c85aaaa19cabdb3ff9df9fd390a8e Mon Sep 17 00:00:00 2001 From: Francis Tsui Date: Wed, 10 Dec 2025 17:08:36 -0800 Subject: [PATCH] Update transmission status logging. PiperOrigin-RevId: 842945158 --- sharing/share_session.cc | 30 ++++++++++++++++++------------ sharing/transfer_metadata.h | 20 ++++++++++---------- 2 files changed, 28 insertions(+), 22 deletions(-) diff --git a/sharing/share_session.cc b/sharing/share_session.cc index 8c737406..0c14e225 100644 --- a/sharing/share_session.cc +++ b/sharing/share_session.cc @@ -72,31 +72,37 @@ std::string TokenToFourDigitString(const std::vector& bytes) { } // namespace /* static */ +// Only used for final statuses. AttachmentTransmissionStatus ShareSession::ConvertToTransmissionStatus( TransferMetadata::Status status) { switch (status) { case TransferMetadata::Status::kComplete: return AttachmentTransmissionStatus:: COMPLETE_ATTACHMENT_TRANSMISSION_STATUS; - case TransferMetadata::Status::kCancelled: - return AttachmentTransmissionStatus:: - CANCELED_ATTACHMENT_TRANSMISSION_STATUS; case TransferMetadata::Status::kFailed: return AttachmentTransmissionStatus:: FAILED_ATTACHMENT_TRANSMISSION_STATUS; - case TransferMetadata::Status::kIncompletePayloads: - return AttachmentTransmissionStatus::FAILED_NO_PAYLOAD; + case TransferMetadata::Status::kRejected: + return AttachmentTransmissionStatus:: + REJECTED_ATTACHMENT_TRANSMISSION_STATUS; + case TransferMetadata::Status::kCancelled: + return AttachmentTransmissionStatus:: + CANCELED_ATTACHMENT_TRANSMISSION_STATUS; + case TransferMetadata::Status::kTimedOut: + return AttachmentTransmissionStatus:: + TIMED_OUT_ATTACHMENT_TRANSMISSION_STATUS; case TransferMetadata::Status::kMediaUnavailable: return AttachmentTransmissionStatus::MEDIA_UNAVAILABLE_ATTACHMENT; - case TransferMetadata::Status::kDeviceAuthenticationFailed: - return AttachmentTransmissionStatus::FAILED_PAIRED_KEYHANDSHAKE; - case TransferMetadata::Status::kRejected: - return AttachmentTransmissionStatus::REJECTED_ATTACHMENT; - case TransferMetadata::Status::kTimedOut: - return AttachmentTransmissionStatus::TIMED_OUT_ATTACHMENT; + case TransferMetadata::Status::kNotEnoughSpace: + return AttachmentTransmissionStatus:: + NOT_ENOUGH_SPACE_ATTACHMENT_TRANSMISSION_STATUS; case TransferMetadata::Status::kUnsupportedAttachmentType: return AttachmentTransmissionStatus:: - UNSUPPORTED_ATTACHMENT_TYPE_ATTACHMENT; + UNSUPPORTED_ATTACHMENT_TYPE_ATTACHMENT_TRANSMISSION_STATUS; + case TransferMetadata::Status::kDeviceAuthenticationFailed: + return AttachmentTransmissionStatus::FAILED_PAIRED_KEYHANDSHAKE; + case TransferMetadata::Status::kIncompletePayloads: + return AttachmentTransmissionStatus::FAILED_NO_PAYLOAD; default: return AttachmentTransmissionStatus:: UNKNOWN_ATTACHMENT_TRANSMISSION_STATUS; diff --git a/sharing/transfer_metadata.h b/sharing/transfer_metadata.h index e41666a7..03171a78 100644 --- a/sharing/transfer_metadata.h +++ b/sharing/transfer_metadata.h @@ -35,16 +35,16 @@ class TransferMetadata { kAwaitingLocalConfirmation, kAwaitingRemoteAcceptance, kInProgress, - kComplete, - kFailed, - kRejected, - kCancelled, - kTimedOut, - kMediaUnavailable, - kNotEnoughSpace, - kUnsupportedAttachmentType, - kDeviceAuthenticationFailed, - kIncompletePayloads, + kComplete, // final + kFailed, // final + kRejected, // final + kCancelled, // final + kTimedOut, // final + kMediaUnavailable, // final + kNotEnoughSpace, // final + kUnsupportedAttachmentType, // final + kDeviceAuthenticationFailed, // final + kIncompletePayloads, // final kMaxValue = kIncompletePayloads }; // LINT.ThenChange(//depot/google3/location/nearby/cpp/sharing/clients/dart/platform/lib/types/transfer_status.dart)