TW-313: apply new file streams encryption

linagora · Aug 3, 2023 · 9acf5ea · 9acf5ea
1 parent 22e69c4
commit 9acf5ea
Show file tree

Hide file tree

Showing 13 changed files with 125 additions and 217 deletions.
diff --git a/lib/data/network/upload_file/file_info.dart b/lib/data/network/upload_file/file_info.dart
diff --git a/lib/data/network/upload_file/file_info_extension.dart b/lib/data/network/upload_file/file_info_extension.dart
@@ -0,0 +1,16 @@
+
+import 'package:flutter/foundation.dart';
+import 'package:matrix/matrix.dart';
+import 'package:mime/mime.dart';
+
+extension FileInfoExtension on FileInfo {
+
+  String get fileExtension => fileName.split('.').last;
+
+  String get mimeType => lookupMimeType(kIsWeb ? fileName : filePath) ?? 'application/octet-stream';
+
+  Map<String, dynamic> get metadata => ({
+    'mimetype': mimeType,
+    'size': fileSize,
+  });
+}
diff --git a/lib/data/network/upload_file/upload_file_api.dart b/lib/data/network/upload_file/upload_file_api.dart
@@ -5,7 +5,7 @@ import 'package:dio/dio.dart';
 import 'package:fluffychat/data/model/upload_file_json.dart';
 import 'package:fluffychat/data/network/dio_client.dart';
 import 'package:fluffychat/data/network/homeserver_endpoint.dart';
-import 'package:fluffychat/data/network/upload_file/file_info.dart';
+import 'package:fluffychat/data/network/upload_file/file_info_extension.dart';
 import 'package:fluffychat/di/global/get_it_initializer.dart';
 import 'package:fluffychat/di/global/network_di.dart';
 import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_file_extension.dart';
@@ -24,7 +24,7 @@ class UploadFileAPI {
       HomeserverEndpoint.uploadMediaServicePath.generateHomeserverIdentityEndpoint(),
       data: fileInfo.readStream ?? File(fileInfo.filePath).openRead(),
       queryParameters: {
-        fileName: fileInfo.fileName,
+        'fileName': fileInfo.fileName,
       },
       options: Options(headers: dioHeaders)
     ).onError((error, stackTrace) => throw Exception(error));

diff --git a/lib/domain/usecase/room/upload_content_interactor.dart b/lib/domain/usecase/room/upload_content_interactor.dart
@@ -18,14 +18,14 @@ class UploadContentInteractor {
       final matrixFile = await entity.toMatrixFile();
       final mediaConfig = await matrixClient.getConfig();
       final maxMediaSize = mediaConfig.mUploadSize;
-      if (matrixFile != null) {
-        final fileSize = matrixFile.bytes.length;
+      if (matrixFile != null && matrixFile.bytes != null) {
+        final fileSize = matrixFile.bytes!.length;
         Logs().d('SendImage::sendImageFileEvent(): FileSized $fileSize || maxMediaSize $maxMediaSize');
         if (maxMediaSize != null && maxMediaSize < fileSize) {
           yield Left(FileTooBigMatrix(FileTooBigMatrixException(fileSize, maxMediaSize)));
         }
         final uri = await matrixClient.uploadContent(
-          matrixFile.bytes,
+          matrixFile.bytes!,
           filename: matrixFile.name,
           contentType: matrixFile.mimeType,
         );

diff --git a/lib/domain/usecase/send_file_interactor.dart b/lib/domain/usecase/send_file_interactor.dart
@@ -1,11 +1,5 @@
-
-import 'dart:convert';
-import 'dart:typed_data';
-
 import 'package:file_picker/file_picker.dart';
-import 'package:fluffychat/data/network/upload_file/file_info.dart';
 import 'package:fluffychat/presentation/extensions/room_extension.dart';
-import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_file_extension.dart';
 import 'package:matrix/matrix.dart';
 import 'package:path_provider/path_provider.dart';
 

diff --git a/lib/domain/usecase/upload_file_interactor.dart b/lib/domain/usecase/upload_file_interactor.dart
diff --git a/lib/pages/chat/events/message_content.dart b/lib/pages/chat/events/message_content.dart
@@ -135,7 +135,6 @@ class MessageContent extends StatelessWidget {
               );
             }
             final filePath = event.getFilePath();
-            debugPrint('filePath: $filePath');
             if (filePath != null) {
               return SendingImageWidget(
                 filePath: filePath,

diff --git a/lib/presentation/extensions/asset_entity_extension.dart b/lib/presentation/extensions/asset_entity_extension.dart
@@ -1,9 +1,7 @@
 import 'dart:convert';
 import 'dart:typed_data';
 
-import 'package:fluffychat/data/network/upload_file/file_info.dart';
-import 'package:fluffychat/presentation/model/image_type.dart';
-import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_file_extension.dart';
+import 'package:fluffychat/data/network/upload_file/file_info_extension.dart';
 import 'package:matrix/matrix.dart';
 import 'package:photo_manager/photo_manager.dart';
 
@@ -27,7 +25,7 @@ extension AssetEntityExtension on AssetEntity {
       return null;
     }
     return FileInfo(
-      fileName,
+      file.path.split('/').last,
       file.path,
       file.lengthSync()
     );