π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
[mobile][photos] add file size to trashdb
Priyanshu Dangareed79eb947eea
diff --git a/mobile/apps/photos/lib/db/trash_db.dart b/mobile/apps/photos/lib/db/trash_db.dartindex f2a5b6e4b7..08e9cdb15b 100644--- a/mobile/apps/photos/lib/db/trash_db.dart+++ b/mobile/apps/photos/lib/db/trash_db.dart@@ -14,7 +14,7 @@ import 'package:sqflite/sqflite.dart';// during restore, all file attributes will be fetched & stored as required.class TrashDB {static const _databaseName = "ente.trash.db";- static const _databaseVersion = 1;+ static const _databaseVersion = 2;static final Logger _logger = Logger("TrashDB");static const tableName = 'trash';@@ -28,6 +28,7 @@ class TrashDB {static const columnFileDecryptionHeader = 'file_decryption_header';static const columnThumbnailDecryptionHeader = 'thumbnail_decryption_header';static const columnUpdationTime = 'updation_time';+ static const columnFileSize = 'file_size';static const columnCreationTime = 'creation_time';static const columnLocalID = 'local_id';@@ -54,6 +55,7 @@ class TrashDB {$columnFileDecryptionHeader TEXT,$columnThumbnailDecryptionHeader TEXT,$columnUpdationTime INTEGER,+ $columnFileSize INTEGER DEFAULT NULL,$columnLocalID TEXT,$columnCreationTime INTEGER NOT NULL,$columnFileMetadata TEXT DEFAULT '{}',@@ -68,6 +70,14 @@ class TrashDB {''');}+ Future<void> _onUpgrade(Database db, int oldVersion, int newVersion) async {+ if (oldVersion < 2) {+ await db.execute(+ 'ALTER TABLE $tableName ADD COLUMN $columnFileSize INTEGER DEFAULT NULL',+ );+ }+ }+TrashDB._privateConstructor();static final TrashDB instance = TrashDB._privateConstructor();@@ -91,6 +101,7 @@ class TrashDB {path,version: _databaseVersion,onCreate: _onCreate,+ onUpgrade: _onUpgrade,);}@@ -173,18 +184,12 @@ class TrashDB {orderBy: '$columnCreationTime ' + order,limit: limit,);- final files = _convertToFiles(results);+ final files = results+ .map((row) => _getTrashFromRow(row))+ .toList(growable: true);return FileLoadResult(files, files.length == limit);}- List<TrashFile> _convertToFiles(List<Map<String, dynamic>> results) {- final List<TrashFile> trashedFiles = [];- for (final result in results) {- trashedFiles.add(_getTrashFromRow(result));- }- return trashedFiles;- }-TrashFile _getTrashFromRow(Map<String, dynamic> row) {final trashFile = TrashFile();trashFile.updateAt = row[columnTrashUpdatedAt];@@ -205,6 +210,7 @@ class TrashDB {final fileMetadata = row[columnFileMetadata] ?? '{}';trashFile.applyMetadata(jsonDecode(fileMetadata));trashFile.localID = row[columnLocalID];+ trashFile.fileSize = row[columnFileSize];trashFile.mMdVersion = row[columnMMdVersion] ?? 0;trashFile.mMdEncodedJson = row[columnMMdEncodedJson] ?? '{}';@@ -234,6 +240,7 @@ class TrashDB {row[columnFileDecryptionHeader] = trash.fileDecryptionHeader;row[columnThumbnailDecryptionHeader] = trash.thumbnailDecryptionHeader;row[columnUpdationTime] = trash.updationTime;+ row[columnFileSize] = trash.fileSize;row[columnLocalID] = trash.localID;row[columnCreationTime] = trash.creationTime;diff --git a/mobile/apps/photos/lib/services/sync/trash_sync_service.dart b/mobile/apps/photos/lib/services/sync/trash_sync_service.dartindex da4c64bbba..002f5438f4 100644--- a/mobile/apps/photos/lib/services/sync/trash_sync_service.dart+++ b/mobile/apps/photos/lib/services/sync/trash_sync_service.dart@@ -170,6 +170,7 @@ class TrashSyncService {trash.uploadedFileID = item["file"]["id"];trash.collectionID = item["file"]["collectionID"];trash.updationTime = item["file"]["updationTime"];+ trash.fileSize = item['file']['info']?['fileSize'];trash.ownerID = item["file"]["ownerID"];trash.encryptedKey = item["file"]["encryptedKey"];trash.keyDecryptionNonce = item["file"]["keyDecryptionNonce"];diff --git a/mobile/apps/photos/lib/ui/viewer/file_details/file_properties_item_widget.dart b/mobile/apps/photos/lib/ui/viewer/file_details/file_properties_item_widget.dartindex bf2e81e6c9..faf147f6a3 100644--- a/mobile/apps/photos/lib/ui/viewer/file_details/file_properties_item_widget.dart+++ b/mobile/apps/photos/lib/ui/viewer/file_details/file_properties_item_widget.dart@@ -100,13 +100,13 @@ class _FilePropertiesItemWidgetState extends State<FilePropertiesItemWidget> {subSectionWidgets.add(Text(dimString.toString(), style: textStyle));}- int fileSize;- if (widget.file.fileSize != null) {- fileSize = widget.file.fileSize!;- } else {- fileSize = await getFile(widget.file).then((f) => f!.length());+ final fileSize =+ widget.file.fileSize ??+ await getFile(widget.file).then((f) => f?.length());++ if (fileSize != null) {+ subSectionWidgets.add(Text(formatBytes(fileSize), style: textStyle));}- subSectionWidgets.add(Text(formatBytes(fileSize), style: textStyle));if ((widget.file.fileType == FileType.video) &&(widget.file.localID != null || widget.file.duration != 0)) {