beenull/ente
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Show no-archived incoming collections

Browse source
This commit is contained in:
Neeraj Gupta 2023-05-29 19:17:35 +05:30
parent ccbd5bf69e
commit 796423499b
3 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/db/files_db.dart
View file

@ -510,7 +510,7 @@ class FilesDB {
final results = await db.query(
filesTable,
where:
'$columnCreationTime >= ? AND $columnCreationTime <= ? AND ($columnOwnerID IS NULL OR $columnOwnerID = ?) AND ($columnCollectionID IS NOT NULL AND $columnCollectionID IS NOT -1)'
'$columnCreationTime >= ? AND $columnCreationTime <= ? AND ($columnCollectionID IS NOT NULL AND $columnCollectionID IS NOT -1)'
' AND $columnMMdVisibility = ?',
whereArgs: [startTime, endTime, ownerID, visibility],
orderBy:
@ -540,9 +540,9 @@ class FilesDB {
final results = await db.query(
filesTable,
where:
'$columnCreationTime >= ? AND $columnCreationTime <= ? AND ($columnOwnerID IS NULL OR $columnOwnerID = ?) AND ($columnMMdVisibility IS NULL OR $columnMMdVisibility = ?)'
'$columnCreationTime >= ? AND $columnCreationTime <= ? AND ($columnMMdVisibility IS NULL OR $columnMMdVisibility = ?)'
' AND ($columnLocalID IS NOT NULL OR ($columnCollectionID IS NOT NULL AND $columnCollectionID IS NOT -1))',
whereArgs: [startTime, endTime, ownerID, visibleVisibility],
whereArgs: [startTime, endTime, visibleVisibility],
orderBy:
'$columnCreationTime ' + order + ', $columnModificationTime ' + order,
limit: limit,

8
lib/services/collections_service.dart
View file

@ -211,6 +211,14 @@ class CollectionsService {
.toSet();
}
Set<int> sharedColectionsHiddenFromTimeline() {
return _collectionIDToCollections.values
.toList()
.where((element) => element.hasShareeArchived())
.map((e) => e.id)
.toSet();
}
int getCollectionSyncTime(int collectionID) {
return _prefs
.getInt(_collectionSyncTimeKeyPrefix + collectionID.toString()) ??

3
lib/ui/home/home_gallery_widget.dart
View file

@ -36,6 +36,9 @@ class HomeGalleryWidget extends StatelessWidget {
Configuration.instance.hasSelectedAllFoldersForBackup();
final collectionsToHide =
CollectionsService.instance.collectionsHiddenFromTimeline();
collectionsToHide.addAll(
CollectionsService.instance.sharedColectionsHiddenFromTimeline(),
);
FileLoadResult result;
if (hasSelectedAllForBackup) {
result = await FilesDB.instance.getAllLocalAndUploadedFiles(