fixup! fixup! TW-1573: change params of getFileEntity

linagora · Apr 10, 2024 · 2df6dcc · 2df6dcc
1 parent 1c1b23b
commit 2df6dcc
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 5 deletions.
diff --git a/lib/src/database/database_api.dart b/lib/src/database/database_api.dart
@@ -96,7 +96,7 @@ abstract class DatabaseApi {
     int? limit,
   });
 
-  Future<Uint8List?> getFile(Uri mxcUri);
+  Future<Uint8List?> getFile(String eventId, String fileName);
 
   Future<File?> getFileEntity(String eventId, String fileName);
 

diff --git a/lib/src/database/hive_collections_database.dart b/lib/src/database/hive_collections_database.dart
@@ -469,7 +469,7 @@ class HiveCollectionsDatabase extends DatabaseApi {
       });
 
   @override
-  Future<Uint8List?> getFile(Uri mxcUri) async {
+  Future<Uint8List?> getFile(String eventId, String fileName) async {
     return null;
   }
 

diff --git a/lib/src/database/hive_database.dart b/lib/src/database/hive_database.dart
@@ -457,7 +457,7 @@ class FamedlySdkHiveDatabase extends DatabaseApi {
       });
 
   @override
-  Future<Uint8List?> getFile(Uri mxcUri) async {
+  Future<Uint8List?> getFile(String eventId, String fileName) async {
     return null;
   }
 

diff --git a/lib/src/event.dart b/lib/src/event.dart
@@ -580,7 +580,7 @@ class Event extends MatrixEvent {
 
     Uint8List? uint8list;
     if (storeable) {
-      uint8list = await database.getFile(mxcUrl);
+      uint8list = await database.getFile(eventId, getThumbnail ? thumbnailFilename : filename);
     }
     return uint8list != null;
   }
@@ -623,7 +623,7 @@ class Event extends MatrixEvent {
 
     Uint8List? uint8list;
     if (storeable) {
-      uint8list = await room.client.database?.getFile(mxcUrl);
+      uint8list = await room.client.database?.getFile(eventId, getThumbnail ? thumbnailFilename : filename);
     }
 
     // Download the file
@@ -663,6 +663,14 @@ class Event extends MatrixEvent {
     return MatrixFile(bytes: uint8list, name: body);
   }
 
+  String get thumbnailFilename {
+    return 'thumbnail-$filename';
+  }
+
+  String get filename {
+    return (content.tryGet<String>('filename') ?? body);
+  }
+
   /// Returns if this is a known event type.
   bool get isEventTypeKnown =>
       EventLocalizations.localizationsMap.containsKey(type);