TW-1561: move filePath in app downloads to utils class

linagora · Apr 1, 2024 · 5175e2a · 5175e2a
1 parent 059b7fc
commit 5175e2a
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 16 deletions.
diff --git a/lib/pages/chat/events/message_download_content.dart b/lib/pages/chat/events/message_download_content.dart
@@ -10,6 +10,7 @@ import 'package:fluffychat/utils/manager/download_manager/download_file_state.da
 import 'package:fluffychat/utils/manager/download_manager/download_manager.dart';
 import 'package:fluffychat/utils/matrix_sdk_extensions/download_file_extension.dart';
 import 'package:fluffychat/utils/matrix_sdk_extensions/event_extension.dart';
+import 'package:fluffychat/utils/storage_directory_utils.dart';
 import 'package:fluffychat/widgets/file_widget/download_file_tile_widget.dart';
 import 'package:fluffychat/widgets/file_widget/file_tile_widget.dart';
 import 'package:fluffychat/widgets/file_widget/message_file_tile_style.dart';
@@ -50,7 +51,10 @@ class _MessageDownloadContentState extends State<MessageDownloadContent>
 
   void checkDownloadFileState() async {
     checkFileExistInMemory();
-    final filePath = await widget.event.getFileNameInAppDownload();
+    final filePath = await StorageDirectoryUtils.instance.getFilePathInAppDownloads(
+      eventId: widget.event.eventId,
+      fileName: widget.event.filename,
+    );
     final file = File(filePath);
     if (await file.exists() &&
         await file.length() == widget.event.getFileSize()) {
@@ -68,9 +72,9 @@ class _MessageDownloadContentState extends State<MessageDownloadContent>
 
   void checkFileExistInMemory() {
     final filePathInMem = widget.event.getFilePathFromMem();
-    if (filePathInMem.isNotEmpty) {
+    if (filePathInMem?.isNotEmpty == true) {
       downloadFileStateNotifier.value = DownloadedPresentationState(
-        filePath: filePathInMem,
+        filePath: filePathInMem!,
       );
       return;
     }

diff --git a/lib/presentation/extensions/send_file_extension.dart b/lib/presentation/extensions/send_file_extension.dart
@@ -308,16 +308,18 @@ extension SendFileExtension on Room {
     required String fileName,
   }) async {
     try {
-      final downloadInAppFolder =
-          await StorageDirectoryUtils.instance.getDownloadFolderInApp();
-      final filePathInAppDownloads = '$downloadInAppFolder/$eventId/$fileName';
-      final fileInMem = sendingFilePlaceholders[sendingEventId]?.filePath;
+      final filePathInAppDownloads =
+          await StorageDirectoryUtils.instance.getFilePathInAppDownloads(
+        eventId: eventId,
+        fileName: fileName,
+      );
+      final sendingFilePath = sendingFilePlaceholders[sendingEventId]?.filePath;
       final file = File(filePathInAppDownloads);
-      if (await file.exists() || fileInMem == null) {
+      if (await file.exists() || sendingFilePath == null) {
         return;
       }
       await file.create(recursive: true);
-      await File(fileInMem).copy(filePathInAppDownloads);
+      await File(sendingFilePath).copy(filePathInAppDownloads);
       Logs().d('File copied in app downloads folder', filePathInAppDownloads);
     } catch (e) {
       Logs().e('Error while copying file in app downloads folder', e);

diff --git a/lib/utils/matrix_sdk_extensions/download_file_extension.dart b/lib/utils/matrix_sdk_extensions/download_file_extension.dart
@@ -276,7 +276,10 @@ extension DownloadFileExtension on Event {
 
     return downloadOrRetrieveAttachment(
       mxcUrl,
-      await getFileNameInAppDownload(),
+      await StorageDirectoryUtils.instance.getFilePathInAppDownloads(
+        eventId: eventId,
+        fileName: filename,
+      ),
       downloadStreamController: downloadStreamController,
       getThumbnail: getThumbnail,
       cancelToken: cancelToken,
@@ -349,8 +352,4 @@ extension DownloadFileExtension on Event {
 
     return fileInfo;
   }
-
-  Future<String> getFileNameInAppDownload() async {
-    return '${await StorageDirectoryUtils.instance.getDownloadFolderInApp()}/$eventId/$filename';
-  }
 }
diff --git a/lib/utils/matrix_sdk_extensions/event_extension.dart b/lib/utils/matrix_sdk_extensions/event_extension.dart
@@ -117,9 +117,9 @@ extension LocalizedBody on Event {
     return room.sendingFilePlaceholders[txId];
   }
 
-  String getFilePathFromMem() {
+  String? getFilePathFromMem() {
     final matrixFile = getMatrixFile();
-    return matrixFile?.filePath ?? '';
+    return matrixFile?.filePath;
   }
 
   Size? getOriginalResolution() {

diff --git a/lib/utils/storage_directory_utils.dart b/lib/utils/storage_directory_utils.dart
@@ -25,4 +25,13 @@ class StorageDirectoryUtils {
     _tempDirectoryPath ??= (await getTemporaryDirectory()).path;
     return '$_tempDirectoryPath/Downloads';
   }
+
+  Future<String> getFilePathInAppDownloads({
+    required String eventId,
+    required String fileName,
+  }) async {
+    final downloadInAppFolder =
+        await StorageDirectoryUtils.instance.getDownloadFolderInApp();
+    return '$downloadInAppFolder/$eventId/$fileName';
+  }
 }