Commit 3e67fec8 authored by Eric Lin's avatar Eric Lin Committed by Commit Bot

[Nearby] Report 1:1 transfer status on the C++ side to JS side

A previous CL collaps transfer status on the C++ side.
Only a limit number of transfer status updates are passed through to JS.
This is blocking some testing automation: https://crbug.com/1136365#c19
For example, kComplete is mapped to kInProgress.
This CL map 1:1 for all statuses.

Manually verified using:
Nearby Share tile for receiving a file.
Nearby Share sheet to send a file.
As a sender from Nearby Share sheet, select the receiver at sender side then reject the connection at receiver side.
Run a JS script to register the onTransferUpdate event and check
kComplete can be received when transmission done.

Bug: 1149598
Change-Id: Ic5bfef95b4e51b16fbc895a42aad578840efa2dc
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2543528Reviewed-by: default avatarJames Vecore <vecore@google.com>
Commit-Queue: Eric Lin <ericth@google.com>
Cr-Commit-Position: refs/heads/master@{#828607}
parent e39e765a
...@@ -25,6 +25,7 @@ base::Optional<nearby_share::mojom::TransferStatus> GetTransferStatus( ...@@ -25,6 +25,7 @@ base::Optional<nearby_share::mojom::TransferStatus> GetTransferStatus(
case TransferMetadata::Status::kAwaitingRemoteAcceptance: case TransferMetadata::Status::kAwaitingRemoteAcceptance:
return nearby_share::mojom::TransferStatus::kAwaitingRemoteAcceptance; return nearby_share::mojom::TransferStatus::kAwaitingRemoteAcceptance;
case TransferMetadata::Status::kComplete: case TransferMetadata::Status::kComplete:
return nearby_share::mojom::TransferStatus::kComplete;
case TransferMetadata::Status::kInProgress: case TransferMetadata::Status::kInProgress:
return nearby_share::mojom::TransferStatus::kInProgress; return nearby_share::mojom::TransferStatus::kInProgress;
case TransferMetadata::Status::kRejected: case TransferMetadata::Status::kRejected:
...@@ -38,11 +39,15 @@ base::Optional<nearby_share::mojom::TransferStatus> GetTransferStatus( ...@@ -38,11 +39,15 @@ base::Optional<nearby_share::mojom::TransferStatus> GetTransferStatus(
case TransferMetadata::Status::kNotEnoughSpace: case TransferMetadata::Status::kNotEnoughSpace:
return nearby_share::mojom::TransferStatus::kNotEnoughSpace; return nearby_share::mojom::TransferStatus::kNotEnoughSpace;
case TransferMetadata::Status::kFailed: case TransferMetadata::Status::kFailed:
case TransferMetadata::Status::kAwaitingRemoteAcceptanceFailed:
return nearby_share::mojom::TransferStatus::kFailed; return nearby_share::mojom::TransferStatus::kFailed;
case TransferMetadata::Status::kAwaitingRemoteAcceptanceFailed:
return nearby_share::mojom::TransferStatus::kAwaitingRemoteAcceptanceFailed;
case TransferMetadata::Status::kUnknown: case TransferMetadata::Status::kUnknown:
return nearby_share::mojom::TransferStatus::kUnknown;
case TransferMetadata::Status::kConnecting: case TransferMetadata::Status::kConnecting:
return nearby_share::mojom::TransferStatus::kConnecting;
case TransferMetadata::Status::kCancelled: case TransferMetadata::Status::kCancelled:
return nearby_share::mojom::TransferStatus::kCancelled;
case TransferMetadata::Status::kMediaDownloading: case TransferMetadata::Status::kMediaDownloading:
case TransferMetadata::Status::kExternalProviderLaunched: case TransferMetadata::Status::kExternalProviderLaunched:
// Ignore all other transfer status updates. // Ignore all other transfer status updates.
......
...@@ -180,6 +180,7 @@ Polymer({ ...@@ -180,6 +180,7 @@ Polymer({
this.needsConfirmation_ = false; this.needsConfirmation_ = false;
break; break;
case nearbyShare.mojom.TransferStatus.kInProgress: case nearbyShare.mojom.TransferStatus.kInProgress:
case nearbyShare.mojom.TransferStatus.kComplete:
this.fire('close'); this.fire('close');
break; break;
case nearbyShare.mojom.TransferStatus.kRejected: case nearbyShare.mojom.TransferStatus.kRejected:
...@@ -198,6 +199,7 @@ Polymer({ ...@@ -198,6 +199,7 @@ Polymer({
case nearbyShare.mojom.TransferStatus.kMediaUnavailable: case nearbyShare.mojom.TransferStatus.kMediaUnavailable:
case nearbyShare.mojom.TransferStatus.kNotEnoughSpace: case nearbyShare.mojom.TransferStatus.kNotEnoughSpace:
case nearbyShare.mojom.TransferStatus.kFailed: case nearbyShare.mojom.TransferStatus.kFailed:
case nearbyShare.mojom.TransferStatus.kAwaitingRemoteAcceptanceFailed:
this.errorTitle_ = this.i18n('nearbyShareErrorCantShare'); this.errorTitle_ = this.i18n('nearbyShareErrorCantShare');
this.errorDescription_ = this.i18n('nearbyShareErrorSomethingWrong'); this.errorDescription_ = this.i18n('nearbyShareErrorSomethingWrong');
break; break;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment