π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
[mobile][photos] support system trash file tracking
Priyanshu Dangarebb345c34ce9b
diff --git a/mobile/apps/photos/lib/models/file/file.dart b/mobile/apps/photos/lib/models/file/file.dartindex 6bbc33273f..abf4b0e1d9 100644--- a/mobile/apps/photos/lib/models/file/file.dart+++ b/mobile/apps/photos/lib/models/file/file.dart@@ -3,6 +3,7 @@ import 'package:logging/logging.dart';import 'package:photo_manager/photo_manager.dart';import 'package:photos/core/constants.dart';import 'package:photos/models/file/file_type.dart';+import "package:photos/models/file/trash_file.dart";import 'package:photos/models/location/location.dart';import "package:photos/models/metadata/file_magic.dart";import "package:photos/module/download/file_url.dart";@@ -79,10 +80,47 @@ class EnteFile {EnteFile();+ EnteFile.from(EnteFile file) {+ generatedID = file.generatedID;+ uploadedFileID = file.uploadedFileID;+ ownerID = file.ownerID;+ collectionID = file.collectionID;+ localID = file.localID;+ title = file.title;+ deviceFolder = file.deviceFolder;+ creationTime = file.creationTime;+ modificationTime = file.modificationTime;+ updationTime = file.updationTime;+ addedTime = file.addedTime;+ location = file.location;+ fileType = file.fileType;+ fileSubType = file.fileSubType;+ duration = file.duration;+ exif = file.exif;+ hash = file.hash;+ metadataVersion = file.metadataVersion;+ encryptedKey = file.encryptedKey;+ keyDecryptionNonce = file.keyDecryptionNonce;+ fileDecryptionHeader = file.fileDecryptionHeader;+ thumbnailDecryptionHeader = file.thumbnailDecryptionHeader;+ metadataDecryptionHeader = file.metadataDecryptionHeader;+ fileSize = file.fileSize;+ mMdEncodedJson = file.mMdEncodedJson;+ mMdVersion = file.mMdVersion;+ magicMetadata = file.magicMetadata;+ pubMmdEncodedJson = file.pubMmdEncodedJson;+ pubMmdVersion = file.pubMmdVersion;+ pubMagicMetadata = file.pubMagicMetadata;+ debugCaption = file.debugCaption;+ }+Future<AssetEntity?> get getAsset {if (localID == null) {return Future.value(null);}+ if (this is TrashFile && (this as TrashFile).systemTrashID != null) {+ return AssetEntity.fromId((this as TrashFile).systemTrashID!.toString());+ }return AssetEntity.fromId(localID!);}diff --git a/mobile/apps/photos/lib/models/file/trash_file.dart b/mobile/apps/photos/lib/models/file/trash_file.dartindex 440635afc8..4f74fcf13b 100644--- a/mobile/apps/photos/lib/models/file/trash_file.dart+++ b/mobile/apps/photos/lib/models/file/trash_file.dart@@ -1,6 +1,17 @@import 'package:photos/models/file/file.dart';class TrashFile extends EnteFile {+ TrashFile();++ TrashFile.fromEnteFile(+ super.file, {+ required this.createdAt,+ required this.updateAt,+ required this.deleteBy,+ required this.isSystemOnly,+ required this.systemTrashID,+ }) : super.from();+// time when file was put in the trash for first timelate int createdAt;@@ -11,4 +22,9 @@ class TrashFile extends EnteFile {// time after which will will be deleted from trash & user's storage usage// will go downlate int deleteBy;++ // is only from system trash, not on ente trash+ bool isSystemOnly = false;++ int? systemTrashID;}diff --git a/mobile/apps/photos/lib/module/download/file.dart b/mobile/apps/photos/lib/module/download/file.dartindex 1969e5ab8b..54d51c8b75 100644--- a/mobile/apps/photos/lib/module/download/file.dart+++ b/mobile/apps/photos/lib/module/download/file.dart@@ -88,6 +88,11 @@ Future<File?> _getLocalDiskFile(} else {return file.getAsset.then((asset) async {if (asset == null || !(await asset.exists)) {+ if (isOrigin && file.isVideo) {+ _logger.warning(+ "Failed to get file for assetID: ${file.localID}, is asset null: ${asset == null}",+ );+ }return null;}return isOrigin ? asset.originFile : asset.file;diff --git a/mobile/apps/photos/lib/module/download/thumbnail.dart b/mobile/apps/photos/lib/module/download/thumbnail.dartindex c365ef6843..e86f57a304 100644--- a/mobile/apps/photos/lib/module/download/thumbnail.dart+++ b/mobile/apps/photos/lib/module/download/thumbnail.dart@@ -19,6 +19,7 @@ import 'package:photos/core/errors.dart';import 'package:photos/core/network/network.dart';import 'package:photos/models/file/file.dart';import 'package:photos/models/file/file_type.dart';+import "package:photos/models/file/trash_file.dart";import 'package:photos/module/download/file.dart';import "package:photos/module/download/file_url.dart";import "package:photos/services/collections_service.dart";@@ -204,7 +205,9 @@ Future<Uint8List?> getThumbnailFromLocal(});} else {return file.getAsset.then((asset) async {- if (asset == null || !(await asset.exists)) {+ if (asset == null ||+ !(await asset.exists ||+ (file is TrashFile && file.localID != null))) {return null;}return assetdiff --git a/mobile/apps/photos/lib/ui/viewer/file/thumbnail_widget.dart b/mobile/apps/photos/lib/ui/viewer/file/thumbnail_widget.dartindex d998cd1525..7b2f27acdc 100644--- a/mobile/apps/photos/lib/ui/viewer/file/thumbnail_widget.dart+++ b/mobile/apps/photos/lib/ui/viewer/file/thumbnail_widget.dart@@ -333,10 +333,13 @@ class _ThumbnailWidgetState extends State<ThumbnailWidget> {if (thumbData == null) {if (widget.file.isUploaded) {_logger.info("Removing localID reference for " + widget.file.tag);- widget.file.localID = null;- if (widget.file.isTrash) {- unawaited(TrashDB.instance.update(widget.file as TrashFile));+ if (widget.file is TrashFile) {+ if (!(widget.file as TrashFile).isSystemOnly) {+ widget.file.localID = null;+ unawaited(TrashDB.instance.update(widget.file as TrashFile));+ }} else {+ widget.file.localID = null;unawaited(FilesDB.instance.update(widget.file));}_loadNetworkImage();