From aa2f11ef3e2da47911ee49d6ad10a7b070d92312 Mon Sep 17 00:00:00 2001
From: Ming Ming <nkming2@gmail.com>
Date: Thu, 19 Sep 2024 01:21:58 +0800
Subject: [PATCH] Fix nc album files being removed in collection items
controller
---
app/lib/controller/collection_items_controller.dart | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/app/lib/controller/collection_items_controller.dart b/app/lib/controller/collection_items_controller.dart
index bfa11e00..9d152c86 100644
--- a/app/lib/controller/collection_items_controller.dart
+++ b/app/lib/controller/collection_items_controller.dart
@@ -14,6 +14,7 @@ import 'package:nc_photos/entity/collection/adapter.dart';
import 'package:nc_photos/entity/collection_item.dart';
import 'package:nc_photos/entity/collection_item/new_item.dart';
import 'package:nc_photos/entity/file_descriptor.dart';
+import 'package:nc_photos/entity/file_util.dart' as file_util;
import 'package:nc_photos/exception_event.dart';
import 'package:nc_photos/object_extension.dart';
import 'package:nc_photos/rx_extension.dart';
@@ -366,8 +367,13 @@ class CollectionItemsController {
if (e is CollectionFileItem) {
final file = ev.dataMap[e.file.fdId];
if (file == null) {
- // removed
- return null;
+ if (file_util.isNcAlbumFile(account, e.file)) {
+ // file shared with us are not in our db
+ return e;
+ } else {
+ // removed
+ return null;
+ }
} else {
return e.copyWith(file: file);
}