Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

[mobile][locker] fix upload issue of cancelled files in pre-upload screen (#13011)

Aaqil Fazil4a26da7d4f93
diff --git a/mobile/apps/locker/lib/ui/pages/file_upload_screen.dart b/mobile/apps/locker/lib/ui/pages/file_upload_screen.dart
index 0a4ebae9ff..16e27fdab9 100644
--- a/mobile/apps/locker/lib/ui/pages/file_upload_screen.dart
+++ b/mobile/apps/locker/lib/ui/pages/file_upload_screen.dart
@@ -11,10 +11,12 @@ import "package:locker/utils/file_icon_utils.dart";
import 'package:path/path.dart' as path;
class FileUploadScreenResult {
+ final List<File> files;
final String note;
final List<Collection> selectedCollections;
FileUploadScreenResult({
+ required this.files,
required this.note,
required this.selectedCollections,
});
@@ -208,6 +210,7 @@ class _FileUploadScreenState extends State<FileUploadScreen> {
.where((c) => _selectedCollectionIds.contains(c.id))
.toList();
final result = FileUploadScreenResult(
+ files: List<File>.of(_files),
note: '',
selectedCollections: selectedCollections,
);
diff --git a/mobile/apps/locker/lib/ui/pages/uploader_page.dart b/mobile/apps/locker/lib/ui/pages/uploader_page.dart
index 5b76bf2442..6c84d51e34 100644
--- a/mobile/apps/locker/lib/ui/pages/uploader_page.dart
+++ b/mobile/apps/locker/lib/ui/pages/uploader_page.dart
@@ -66,6 +66,7 @@ abstract class UploaderPageState<T extends UploaderPage> extends State<T> {
var hasUploadError = false;
var completedPrimaryUploads = 0;
var didShowDialog = false;
+ var filesToUpload = <File>[];
final l10n = context.strings;
ProgressDialog? progressDialog;
@@ -90,6 +91,11 @@ abstract class UploaderPageState<T extends UploaderPage> extends State<T> {
),
);
+ filesToUpload = uploadResult?.files ?? [];
+ if (filesToUpload.isEmpty) {
+ return _UploadFilesOutcome.cancelled;
+ }
+
final isUncategorizedUpload =
uploadResult != null && uploadResult.selectedCollections.isEmpty;
final isRegularUpload =
@@ -106,14 +112,17 @@ abstract class UploaderPageState<T extends UploaderPage> extends State<T> {
if (mounted) {
final dialog = createProgressDialog(
context,
- l10n.uploadedFilesProgress(completed: 0, total: files.length),
+ l10n.uploadedFilesProgress(
+ completed: 0,
+ total: filesToUpload.length,
+ ),
);
progressDialog = dialog;
didShowDialog = await dialog.show();
}
int completedUploads = 0;
- for (final file in files) {
+ for (final file in filesToUpload) {
final fileUploadFuture = FileUploader.instance.upload(
file,
uploadResult.selectedCollections.first,
@@ -131,7 +140,7 @@ abstract class UploaderPageState<T extends UploaderPage> extends State<T> {
progressDialog?.update(
message: l10n.uploadedFilesProgress(
completed: completedUploads,
- total: files.length,
+ total: filesToUpload.length,
),
);
} catch (e, s) {
@@ -204,7 +213,8 @@ abstract class UploaderPageState<T extends UploaderPage> extends State<T> {
}
} catch (e, s) {
final didUploadAllFiles =
- files.isNotEmpty && completedPrimaryUploads == files.length;
+ filesToUpload.isNotEmpty &&
+ completedPrimaryUploads == filesToUpload.length;
outcome = didUploadAllFiles
? _UploadFilesOutcome.succeeded
: _UploadFilesOutcome.failed;