Fix #66: ios - file is downloaded but the state is not updated properly

Signed-off-by: huynguyennovem <huynguyennovem@gmail.com>

Author: huynguyennovem

ios/Runner/Info.plist

@@ -60,6 +60,8 @@
     </dict>
     <key>FDMaximumConcurrentTasks</key>
     <integer>5</integer>
+    <key>UISupportsDocumentBrowser</key>
+    <true/>
     <key>LSSupportsOpeningDocumentsInPlace</key>
     <true/>
     <key>UIFileSharingEnabled</key>

lib/provider/file_provider.dart

@@ -29,11 +29,11 @@ class FileProvider extends ChangeNotifier {
     required SharedFileState newFileState,
     required String savedDir,
   }) {
-    final oldFile = _files.firstWhere((file) => fileName == file.name);
+    if(_files.isEmpty) return;
+    final oldFile = _files.firstWhere((file) => fileName.trim() == file.name?.trim());
     final oldIndex = _files.indexOf(oldFile);
     final updatedFile = oldFile.copyWith(state: newFileState, savedDir: savedDir);
     _files[oldIndex] = updatedFile;
-
     notifyListeners();
   }
 }

lib/service/download_service.dart

@@ -46,7 +46,7 @@ class DownloadService {
     String? externalStorageDirPath;
     // fix https://github.com/huynguyennovem/netshare/issues/67:
     // file name has space > need to encode the uri
-    String downloadFileUrl = fileUrl;
+    String encodedFileUrl = Uri.encodeFull(fileUrl);
     if (Platform.isAndroid) {
       try {
         externalStorageDirPath = await AndroidPathProvider.downloadsPath;
@@ -57,27 +57,28 @@ class DownloadService {
       }
     } else if (Platform.isIOS) {
       externalStorageDirPath = (await getApplicationDocumentsDirectory()).absolute.path;
-      downloadFileUrl = Uri.encodeFull(fileUrl);
     }
     if (null != externalStorageDirPath) {
       final savedDir = Directory(externalStorageDirPath);
       if (!savedDir.existsSync()) {
         await savedDir.create();
       }
+      final encodedFileName = path.basename(encodedFileUrl);
+      final decodedFileName = Uri.decodeFull(encodedFileName);
+      // use raw file name for beautiful name only (without encoded name)
       final taskId = await FlutterDownloader.enqueue(
-        url: downloadFileUrl,
+        url: encodedFileUrl,
+        fileName: decodedFileName,
         savedDir: savedDir.path,
         saveInPublicStorage: true,
       );
-      debugPrint('Download taskId: $taskId');
 
       // add to stream
-      final fileName = path.basename(downloadFileUrl);
       updateDownloadState(
         DownloadEntity(
-          taskId ?? fileName,
-          fileName,
-          downloadFileUrl,
+          taskId ?? decodedFileName,
+          decodedFileName,
+          encodedFileUrl,
           savedDir.path,
           DownloadManner.flutterDownloader,
           DownloadState.downloading,

lib/ui/client/client_widget.dart

@@ -75,22 +75,22 @@ class _ClientWidgetState extends State<ClientWidget> {
             String? fileName;
             String? url;
             String? savedDir;
-            if (null != tasks) {
+            if (null != tasks && tasks.isNotEmpty) {
               final task = tasks.firstWhere((element) => taskId == element.taskId);
               fileName = task.filename;
               url = task.url;
               savedDir = task.savedDir;
+              getIt.get<DownloadService>().updateDownloadState(
+                  DownloadEntity(
+                    taskId,
+                    fileName ?? '',
+                    url,
+                    savedDir,
+                    DownloadManner.flutterDownloader,
+                    state,
+                  )
+              );
             }
-            getIt.get<DownloadService>().updateDownloadState(
-                DownloadEntity(
-                  taskId,
-                  fileName ?? '',
-                  url ?? '',
-                  savedDir ?? '',
-                  DownloadManner.flutterDownloader,
-                  state,
-                )
-            );
           }
         });
         FlutterDownloader.registerCallback(downloadCallback);
@@ -151,7 +151,7 @@ class _ClientWidgetState extends State<ClientWidget> {
   @pragma('vm:entry-point')
   static void downloadCallback(
     String id,
-    DownloadTaskStatus status,
+    int status,
     int progress,
   ) {
     debugPrint(
@@ -161,7 +161,7 @@ class _ClientWidgetState extends State<ClientWidget> {
     // TODO: 1. Flutter engine issue: can only send basic dart type + restart/hot reload does not work
     //  (https://github.com/flutter/flutter/issues/119589)
     //  can only send basic dart type -> Fix: convert status entity to int
-    IsolateNameServer.lookupPortByName('downloader_send_port')?.send([id, status.value, progress]);
+    IsolateNameServer.lookupPortByName('downloader_send_port')?.send([id, status, progress]);
   }
 
   @override

pubspec.yaml

@@ -52,7 +52,7 @@ dependencies:
   mime: ^1.0.3
   http_parser: ^4.0.2
   share_plus: ^6.3.0
-  flutter_downloader: ^1.10.1+2
+  flutter_downloader: ^1.11.1
   path_provider: ^2.0.11
   android_path_provider: ^0.3.0
   permission_handler: ^10.2.0