TW-1806: update mime type when drag/drop, paste and add file

linagora · Jun 10, 2024 · 4aeb571 · 4aeb571
1 parent 6d9c44b
commit 4aeb571
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/lib/domain/model/extensions/platform_file/platform_file_extension.dart b/lib/domain/model/extensions/platform_file/platform_file_extension.dart
@@ -1,4 +1,5 @@
 import 'package:file_picker/file_picker.dart';
+import 'package:fluffychat/utils/mime_type_uitls.dart';
 import 'package:matrix/matrix.dart';
 
 extension PlatformFileListExtension on PlatformFile {
@@ -21,6 +22,7 @@ extension PlatformFileListExtension on PlatformFile {
       filePath: '',
       readStream: readStream,
       sizeInBytes: size,
+      mimeType: MimeTypeUitls.instance.getTwakeMimeType(name),
     );
   }
 

diff --git a/lib/presentation/mixins/paste_image_mixin.dart b/lib/presentation/mixins/paste_image_mixin.dart
@@ -1,6 +1,8 @@
 import 'package:fluffychat/pages/chat/send_file_dialog/send_file_dialog.dart';
 import 'package:fluffychat/presentation/enum/chat/send_media_with_caption_status_enum.dart';
 import 'package:fluffychat/utils/clipboard.dart';
+import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_file_extension.dart';
+import 'package:fluffychat/utils/mime_type_uitls.dart';
 import 'package:fluffychat/utils/platform_infos.dart';
 import 'package:fluffychat/utils/twake_snackbar.dart';
 import 'package:flutter/material.dart';
@@ -35,11 +37,11 @@ mixin PasteImageMixin {
           (matrixFile) => matrixFile != null,
         )
         .map(
-          (matrixFile) => MatrixImageFile(
+          (matrixFile) => MatrixFile(
             name: matrixFile!.name,
-            mimeType: matrixFile.mimeType,
+            mimeType: MimeTypeUitls.instance.getTwakeMimeType(matrixFile.name),
             bytes: matrixFile.bytes,
-          ),
+          ).detectFileType,
         )
         .cast<MatrixImageFile>()
         .toList();

diff --git a/lib/widgets/mixins/drag_drog_file_mixin.dart b/lib/widgets/mixins/drag_drog_file_mixin.dart
@@ -2,6 +2,7 @@ import 'package:desktop_drop/desktop_drop.dart';
 import 'package:fluffychat/pages/chat/send_file_dialog/send_file_dialog.dart';
 import 'package:fluffychat/utils/dialog/twake_dialog.dart';
 import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_file_extension.dart';
+import 'package:fluffychat/utils/mime_type_uitls.dart';
 import 'package:fluffychat/utils/platform_infos.dart';
 import 'package:flutter/material.dart';
 import 'package:matrix/matrix.dart';
@@ -30,6 +31,8 @@ mixin DragDrogFileMixin {
         MatrixFile(
           bytes: bytesList.result![i],
           name: details.files[i].name,
+          mimeType:
+              MimeTypeUitls.instance.getTwakeMimeType(details.files[i].name),
         ).detectFileType,
       );
     }