Skip to content

armgit / ente

Public Imported from GitHub
0

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

[mobile][photos] always load local file if system trash in video players

Priyanshu Dangare4f34e56640e8
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 05c9b42dff..fca0639348 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,6 +16,7 @@ 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";
@@ -158,7 +159,10 @@ class _VideoWidgetMediaKitState extends State<VideoWidgetMediaKit>
}
} else {
widget.file.getAsset.then((asset) async {
- if (asset == null || !(await asset.exists)) {
+ if (asset == null ||
+ !(await asset.exists ||
+ (widget.file is TrashFile &&
+ (widget.file as TrashFile).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 47e1ec4449..857c464567 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,6 +18,7 @@ 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";
@@ -201,7 +202,10 @@ class _VideoWidgetNativeState extends State<VideoWidgetNative>
}
} else {
await widget.file.getAsset.then((asset) async {
- if (asset == null || !(await asset.exists)) {
+ if (asset == null ||
+ !(await asset.exists ||
+ (widget.file is TrashFile &&
+ (widget.file as TrashFile).systemTrashID != null))) {
if (widget.file.uploadedFileID != null) {
_loadNetworkVideo(update);
}