Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

[mobile][photos] refactor trash file object casting conditions

Priyanshu Dangare73148dce9fea
diff --git a/mobile/apps/photos/lib/models/file/extensions/file_props.dart b/mobile/apps/photos/lib/models/file/extensions/file_props.dart
index 1ab113200f..93758af1a0 100644
--- a/mobile/apps/photos/lib/models/file/extensions/file_props.dart
+++ b/mobile/apps/photos/lib/models/file/extensions/file_props.dart
@@ -42,7 +42,7 @@ extension FilePropsExtn on EnteFile {
bool get canEditMetaInfo => isUploaded && isOwner;
- bool get isTrash => this is TrashFile;
+ TrashFile? get asTrashFile => (this is TrashFile) ? this as TrashFile : null;
// Return true if the file was uploaded via collect photos workflow
bool get isCollect => uploaderName != null;
diff --git a/mobile/apps/photos/lib/models/file/file.dart b/mobile/apps/photos/lib/models/file/file.dart
index abf4b0e1d9..12ae1168ed 100644
--- a/mobile/apps/photos/lib/models/file/file.dart
+++ b/mobile/apps/photos/lib/models/file/file.dart
@@ -2,8 +2,8 @@ import 'package:flutter/foundation.dart';
import 'package:logging/logging.dart';
import 'package:photo_manager/photo_manager.dart';
import 'package:photos/core/constants.dart';
+import "package:photos/models/file/extensions/file_props.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";
@@ -118,8 +118,8 @@ class EnteFile {
if (localID == null) {
return Future.value(null);
}
- if (this is TrashFile && (this as TrashFile).systemTrashID != null) {
- return AssetEntity.fromId((this as TrashFile).systemTrashID!.toString());
+ if (asTrashFile?.systemTrashID != null) {
+ return AssetEntity.fromId(asTrashFile!.systemTrashID!.toString());
}
return AssetEntity.fromId(localID!);
}
diff --git a/mobile/apps/photos/lib/ui/viewer/file/file_bottom_bar.dart b/mobile/apps/photos/lib/ui/viewer/file/file_bottom_bar.dart
index 84f961cc36..86e10c3016 100644
--- a/mobile/apps/photos/lib/ui/viewer/file/file_bottom_bar.dart
+++ b/mobile/apps/photos/lib/ui/viewer/file/file_bottom_bar.dart
@@ -264,7 +264,7 @@ class FileBottomBarState extends State<FileBottomBar> {
),
onPressed: () async {
final trashedFile = <TrashFile>[];
- trashedFile.add(widget.file as TrashFile);
+ trashedFile.add(widget.file.asTrashFile!);
if (await deleteFromTrash(context, trashedFile) == true) {
if (!mounted) return;
Navigator.pop(context);
diff --git a/mobile/apps/photos/lib/ui/viewer/file/file_details_widget.dart b/mobile/apps/photos/lib/ui/viewer/file/file_details_widget.dart
index fbcb2e3056..2c57eadd02 100644
--- a/mobile/apps/photos/lib/ui/viewer/file/file_details_widget.dart
+++ b/mobile/apps/photos/lib/ui/viewer/file/file_details_widget.dart
@@ -156,7 +156,7 @@ class _FileDetailsWidgetState extends State<FileDetailsWidget> {
//Make sure the bottom most tile is always the same one, that is it should
//not be rendered only if a condition is met.
final fileDetailsTiles = <Widget>[];
- final bool canEditCaption = isFileOwner && !file.isTrash;
+ final bool canEditCaption = isFileOwner && file.asTrashFile == null;
fileDetailsTiles.add(
!widget.file.isUploaded ||
(!canEditCaption && (widget.file.caption?.isEmpty ?? true))
@@ -264,7 +264,7 @@ class _FileDetailsWidgetState extends State<FileDetailsWidget> {
),
]);
- if (!file.isTrash) {
+ if (file.asTrashFile == null) {
fileDetailsTiles.addAll([
AlbumsItemWidget(file, _currentUserID),
const SizedBox(height: Spacing.xxl),
diff --git a/mobile/apps/photos/lib/ui/viewer/file/thumbnail_widget.dart b/mobile/apps/photos/lib/ui/viewer/file/thumbnail_widget.dart
index 7b2f27acdc..e1e6d46331 100644
--- a/mobile/apps/photos/lib/ui/viewer/file/thumbnail_widget.dart
+++ b/mobile/apps/photos/lib/ui/viewer/file/thumbnail_widget.dart
@@ -17,7 +17,6 @@ import 'package:photos/events/local_photos_updated_event.dart';
import 'package:photos/models/file/extensions/file_props.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/models/gallery_type.dart';
import 'package:photos/module/download/file.dart';
import 'package:photos/module/download/thumbnail.dart';
@@ -256,8 +255,8 @@ class _ThumbnailWidgetState extends State<ThumbnailWidget> {
viewChildren.add(const UnSyncedIcon());
}
- if (widget.file.isTrash) {
- viewChildren.add(TrashedFileOverlayText(widget.file as TrashFile));
+ if (widget.file.asTrashFile != null) {
+ viewChildren.add(TrashedFileOverlayText(widget.file.asTrashFile!));
} else if (galleryContext?.type == GroupType.size) {
viewChildren.add(FileSizeOverlayText(widget.file));
} else if (widget.file.debugCaption != null) {
@@ -333,10 +332,10 @@ class _ThumbnailWidgetState extends State<ThumbnailWidget> {
if (thumbData == null) {
if (widget.file.isUploaded) {
_logger.info("Removing localID reference for " + widget.file.tag);
- if (widget.file is TrashFile) {
- if (!(widget.file as TrashFile).isSystemOnly) {
+ if (widget.file.asTrashFile != null) {
+ if (!widget.file.asTrashFile!.isSystemOnly) {
widget.file.localID = null;
- unawaited(TrashDB.instance.update(widget.file as TrashFile));
+ unawaited(TrashDB.instance.update(widget.file.asTrashFile!));
}
} else {
widget.file.localID = null;
diff --git a/mobile/apps/photos/lib/ui/viewer/file/video_widget_media_kit.dart b/mobile/apps/photos/lib/ui/viewer/file/video_widget_media_kit.dart
index fca0639348..da2141c4b9 100644
--- a/mobile/apps/photos/lib/ui/viewer/file/video_widget_media_kit.dart
+++ b/mobile/apps/photos/lib/ui/viewer/file/video_widget_media_kit.dart
@@ -16,7 +16,6 @@ import "package:photos/events/stream_switched_event.dart";
import "package:photos/events/video_mute_changed_event.dart";
import "package:photos/models/file/extensions/file_props.dart";
import "package:photos/models/file/file.dart";
-import "package:photos/models/file/trash_file.dart";
import "package:photos/module/download/file.dart";
import "package:photos/module/download/task.dart";
import "package:photos/service_locator.dart";
@@ -161,8 +160,7 @@ class _VideoWidgetMediaKitState extends State<VideoWidgetMediaKit>
widget.file.getAsset.then((asset) async {
if (asset == null ||
!(await asset.exists ||
- (widget.file is TrashFile &&
- (widget.file as TrashFile).systemTrashID != null))) {
+ (widget.file.asTrashFile?.systemTrashID != null))) {
if (widget.file.uploadedFileID != null) {
_loadNetworkVideo();
}
diff --git a/mobile/apps/photos/lib/ui/viewer/file/video_widget_native.dart b/mobile/apps/photos/lib/ui/viewer/file/video_widget_native.dart
index 857c464567..e364598fc1 100644
--- a/mobile/apps/photos/lib/ui/viewer/file/video_widget_native.dart
+++ b/mobile/apps/photos/lib/ui/viewer/file/video_widget_native.dart
@@ -18,7 +18,6 @@ import "package:photos/events/use_media_kit_for_video.dart";
import "package:photos/events/video_mute_changed_event.dart";
import "package:photos/models/file/extensions/file_props.dart";
import "package:photos/models/file/file.dart";
-import "package:photos/models/file/trash_file.dart";
import "package:photos/models/preview/playlist_data.dart";
import "package:photos/module/download/file.dart";
import "package:photos/module/download/task.dart";
@@ -204,8 +203,7 @@ class _VideoWidgetNativeState extends State<VideoWidgetNative>
await widget.file.getAsset.then((asset) async {
if (asset == null ||
!(await asset.exists ||
- (widget.file is TrashFile &&
- (widget.file as TrashFile).systemTrashID != null))) {
+ widget.file.asTrashFile?.systemTrashID != null)) {
if (widget.file.uploadedFileID != null) {
_loadNetworkVideo(update);
}
diff --git a/mobile/apps/photos/lib/ui/viewer/file_details/creation_time_item_widget.dart b/mobile/apps/photos/lib/ui/viewer/file_details/creation_time_item_widget.dart
index adbf53d9b1..848cb73813 100644
--- a/mobile/apps/photos/lib/ui/viewer/file_details/creation_time_item_widget.dart
+++ b/mobile/apps/photos/lib/ui/viewer/file_details/creation_time_item_widget.dart
@@ -29,7 +29,7 @@ class _CreationTimeItemState extends State<CreationTimeItem> {
(widget.file.ownerID == null ||
widget.file.ownerID == widget.currentUserID) &&
widget.file.uploadedFileID != null &&
- !widget.file.isTrash;
+ widget.file.asTrashFile == null;
return GestureDetector(
behavior: HitTestBehavior.translucent,
onTap: () {
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.dart
index faf147f6a3..05680dc2f9 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
@@ -48,7 +48,7 @@ class _FilePropertiesItemWidgetState extends State<FilePropertiesItemWidget> {
editOnTap:
widget.file.uploadedFileID == null ||
widget.file.ownerID != widget.currentUserID ||
- widget.file.isTrash
+ widget.file.asTrashFile != null
? null
: () async {
await editFilename(context, widget.file);