TW-1702: regression fix + tests added for download on mobile

linagora · May 28, 2024 · 6cd553c · 6cd553c
1 parent 3d348cd
commit 6cd553c
Show file tree

Hide file tree

Showing 5 changed files with 1,343 additions and 19 deletions.
diff --git a/lib/utils/manager/download_manager/download_manager.dart b/lib/utils/manager/download_manager/download_manager.dart
@@ -26,14 +26,14 @@ class DownloadManager {
 
   final workingQueue = getIt.get<DownloadWorkerQueue>();
 
-  final Map<String, DownloadFileInfo> _eventIdMapDownloadFileInfo = {};
+  final Map<String, DownloadFileInfo> eventIdMapDownloadFileInfo = {};
 
   void cancelDownload(String eventId) {
-    final cancelToken = _eventIdMapDownloadFileInfo[eventId]?.cancelToken;
+    final cancelToken = eventIdMapDownloadFileInfo[eventId]?.cancelToken;
     if (cancelToken != null) {
       try {
         cancelToken.cancel();
-        _eventIdMapDownloadFileInfo[eventId]?.downloadStateStreamController.add(
+        eventIdMapDownloadFileInfo[eventId]?.downloadStateStreamController.add(
               Left(
                 DownloadFileFailureState(
                   exception: CancelDownloadingException(),
@@ -44,7 +44,7 @@ class DownloadManager {
         Logs().e(
           'DownloadManager::cancelDownload(): $e',
         );
-        _eventIdMapDownloadFileInfo[eventId]?.downloadStateStreamController.add(
+        eventIdMapDownloadFileInfo[eventId]?.downloadStateStreamController.add(
               Left(
                 DownloadFileFailureState(exception: e),
               ),
@@ -60,7 +60,7 @@ class DownloadManager {
   ) {
     final streamController = StreamController<Either<Failure, Success>>();
 
-    _eventIdMapDownloadFileInfo[event.eventId] = DownloadFileInfo(
+    eventIdMapDownloadFileInfo[event.eventId] = DownloadFileInfo(
       eventId: event.eventId,
       cancelToken: CancelToken(),
       downloadStateStreamController: streamController,
@@ -69,25 +69,25 @@ class DownloadManager {
   }
 
   Stream<Either<Failure, Success>>? getDownloadStateStream(String eventId) {
-    return _eventIdMapDownloadFileInfo[eventId]?.downloadStream;
+    return eventIdMapDownloadFileInfo[eventId]?.downloadStream;
   }
 
   Future<void> clear(String eventId) async {
     try {
-      await _eventIdMapDownloadFileInfo[eventId]
+      await eventIdMapDownloadFileInfo[eventId]
           ?.downloadStateStreamController
           .close();
     } catch (e) {
       Logs().e(
         'DownloadManager::_clear(): $e',
       );
-      _eventIdMapDownloadFileInfo[eventId]?.downloadStateStreamController.add(
+      eventIdMapDownloadFileInfo[eventId]?.downloadStateStreamController.add(
             Left(
               DownloadFileFailureState(exception: e),
             ),
           );
     } finally {
-      _eventIdMapDownloadFileInfo.remove(eventId);
+      eventIdMapDownloadFileInfo.remove(eventId);
       Logs().i(
         'DownloadManager::clear with $eventId successfully',
       );
@@ -100,14 +100,14 @@ class DownloadManager {
     bool isFirstPriority = false,
   }) async {
     _initDownloadFileInfo(event);
-    final streamController = _eventIdMapDownloadFileInfo[event.eventId]
+    final streamController = eventIdMapDownloadFileInfo[event.eventId]
         ?.downloadStateStreamController;
-    final cancelToken = _eventIdMapDownloadFileInfo[event.eventId]?.cancelToken;
+    final cancelToken = eventIdMapDownloadFileInfo[event.eventId]?.cancelToken;
     if (streamController == null || cancelToken == null) {
       Logs().e(
         'DownloadManager::download(): streamController or cancelToken is null',
       );
-      _eventIdMapDownloadFileInfo[event.eventId]
+      eventIdMapDownloadFileInfo[event.eventId]
           ?.downloadStateStreamController
           .add(
             Left(

diff --git a/lib/utils/manager/storage_directory_manager.dart b/lib/utils/manager/storage_directory_manager.dart
@@ -13,6 +13,8 @@ class StorageDirectoryManager {
 
   static StorageDirectoryManager get instance => _instance;
 
+  factory StorageDirectoryManager() => _instance;
+
   Future<String> getFileStoreDirectory() async {
     try {
       try {

diff --git a/lib/widgets/mixins/download_file_on_mobile_mixin.dart b/lib/widgets/mixins/download_file_on_mobile_mixin.dart
@@ -6,6 +6,7 @@ import 'package:fluffychat/app_state/failure.dart';
 import 'package:fluffychat/app_state/success.dart';
 import 'package:fluffychat/di/global/get_it_initializer.dart';
 import 'package:fluffychat/presentation/model/chat/downloading_state_presentation_model.dart';
+import 'package:fluffychat/utils/exception/downloading_exception.dart';
 import 'package:fluffychat/utils/manager/download_manager/download_file_state.dart';
 import 'package:fluffychat/utils/manager/storage_directory_manager.dart';
 import 'package:fluffychat/utils/matrix_sdk_extensions/download_file_extension.dart';
@@ -17,6 +18,8 @@ import 'package:matrix/matrix.dart';
 mixin DownloadFileOnMobileMixin<T extends StatefulWidget> on State<T> {
   final downloadManager = getIt.get<DownloadManager>();
 
+  final storageDirectoryManager = StorageDirectoryManager();
+
   final downloadFileStateNotifier = ValueNotifier<DownloadPresentationState>(
     const NotDownloadPresentationState(),
   );
@@ -66,15 +69,17 @@ mixin DownloadFileOnMobileMixin<T extends StatefulWidget> on State<T> {
   }
 
   Future<void> checkFileInDownloadsInApp() async {
-    final filePath =
-        await StorageDirectoryManager.instance.getFilePathInAppDownloads(
+    final filePath = await storageDirectoryManager.getFilePathInAppDownloads(
       eventId: event.eventId,
       fileName: event.filename,
     );
-    final file = File(filePath);
+    updateStateIfFileExists(File(filePath));
+  }
+
+  Future<void> updateStateIfFileExists(File file) async {
     if (await file.exists() && await file.length() == event.getFileSize()) {
       downloadFileStateNotifier.value = DownloadedPresentationState(
-        filePath: filePath,
+        filePath: file.path,
       );
       return;
     }
@@ -89,9 +94,15 @@ mixin DownloadFileOnMobileMixin<T extends StatefulWidget> on State<T> {
   void setupDownloadingProcess(Either<Failure, Success> resultEvent) {
     resultEvent.fold(
       (failure) {
-        Logs()
-            .e('$T::setupDownloadingProcess::onDownloadingProcess(): $failure');
-        downloadFileStateNotifier.value = const NotDownloadPresentationState();
+        Logs().e('MessageDownloadContent::onDownloadingProcess(): $failure');
+        if (failure is DownloadFileFailureState &&
+            failure.exception is CancelDownloadingException) {
+          downloadFileStateNotifier.value =
+              const NotDownloadPresentationState();
+        } else {
+          downloadFileStateNotifier.value =
+              DownloadErrorPresentationState(error: failure);
+        }
         streamSubscription?.cancel();
       },
       (success) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -13,6 +13,8 @@ class StorageDirectoryManager { @@
       static StorageDirectoryManager get instance => _instance;
+      factory StorageDirectoryManager() => _instance;
       Future<String> getFileStoreDirectory() async {
         try {
           try {
@@ Expand Down @@