From e65d1d59308affabb0cc9852a628652212f20e48 Mon Sep 17 00:00:00 2001
From: shenlong <139912620+shenlong-tanwen@users.noreply.github.com>
Date: Sun, 26 Nov 2023 03:45:18 +0000
Subject: [PATCH] refactor: mobile - send livephoto as a separate request
 (#5275)

* refactor: mobile - send livephoto as a separate request

* fix: create new request for live asset

---------

Co-authored-by: shalong-tanwen <139912620+shalong-tanwen@users.noreply.github.com>
---
 .../backup/services/backup.service.dart       | 32 ++++++++++++++-----
 1 file changed, 24 insertions(+), 8 deletions(-)

diff --git a/mobile/lib/modules/backup/services/backup.service.dart b/mobile/lib/modules/backup/services/backup.service.dart
index 0e0a14a8c7..f4ca5932a1 100644
--- a/mobile/lib/modules/backup/services/backup.service.dart
+++ b/mobile/lib/modules/backup/services/backup.service.dart
@@ -278,13 +278,6 @@ class BackupService {
 
           req.files.add(assetRawUploadData);
 
-          if (entity.isLivePhoto) {
-            var livePhotoRawUploadData = await _getLivePhotoFile(entity);
-            if (livePhotoRawUploadData != null) {
-              req.files.add(livePhotoRawUploadData);
-            }
-          }
-
           setCurrentUploadAssetCb(
             CurrentUploadAsset(
               id: entity.id,
@@ -299,6 +292,29 @@ class BackupService {
           var response =
               await httpClient.send(req, cancellationToken: cancelToken);
 
+          // Send live photo separately
+          if (entity.isLivePhoto) {
+            var livePhotoRawUploadData = await _getLivePhotoFile(entity);
+            if (livePhotoRawUploadData != null) {
+              var livePhotoReq = MultipartRequest(
+                req.method,
+                req.url,
+                onProgress: req.onProgress,
+              )
+                ..headers.addAll(req.headers)
+                ..fields.addAll(req.fields);
+
+              livePhotoReq.files.add(livePhotoRawUploadData);
+              // Send live photo only if the non-motion part is successful
+              if (response.statusCode == 200 || response.statusCode == 201) {
+                response = await httpClient.send(
+                  livePhotoReq,
+                  cancellationToken: cancelToken,
+                );
+              }
+            }
+          }
+
           if (response.statusCode == 200) {
             // asset is a duplicate (already exists on the server)
             duplicatedAssetIds.add(entity.id);
@@ -356,7 +372,7 @@ class BackupService {
       var fileStream = motionFile.openRead();
       String fileName = p.basename(motionFile.path);
       return http.MultipartFile(
-        "livePhotoData",
+        "assetData",
         fileStream,
         motionFile.lengthSync(),
         filename: fileName,