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

Merge pull request #455 from ente-io/bugFix

Browse source 
Fix minor bugs in share warning for collections with hidden files
This commit is contained in:
Ashil 2022-09-02 10:57:28 +05:30 • committed by GitHub
commit 8b28493803
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/db/files_db.dart
View file

@ -445,7 +445,7 @@ class FilesDB {
whereArgs: [ownerID, visibility],
distinct: true,
);
Set<int> collectionIDsOfHiddenFiles = {};
final Set<int> collectionIDsOfHiddenFiles = {};
for (var result in results) {
collectionIDsOfHiddenFiles.add(result['collection_id']);
}

2
lib/services/feature_flag_service.dart
View file

@ -94,7 +94,7 @@ class FeatureFlagService {
}
bool isInternalUserOrDebugBuild() {
String email = Configuration.instance.getEmail();
final String email = Configuration.instance.getEmail();
return (email != null && email.endsWith("@ente.io")) || kDebugMode;
}

26
lib/ui/viewer/gallery/gallery_app_bar_widget.dart
View file

@ -133,8 +133,9 @@ class _GalleryAppBarWidgetState extends State<GalleryAppBarWidget> {
child: IconButton(
icon: Icon(Icons.adaptive.share),
onPressed: () async {
if (FeatureFlagService.instance.isInternalUserOrDebugBuild() &&
await _collectionHasHiddenFiles(widget.collection.id)) {
final bool showHiddenWarning =
await _shouldShowHiddenFilesWarning(widget.collection);
if (showHiddenWarning) {
final choice = await showChoiceDialog(
context,
'Share hidden items?',
@ -144,12 +145,11 @@ class _GalleryAppBarWidgetState extends State<GalleryAppBarWidget> {
secondActionColor:
Theme.of(context).colorScheme.defaultTextColor,
);
if (choice == DialogUserChoice.secondChoice) {
_showShareCollectionDialog();
if (choice != DialogUserChoice.secondChoice) {
return;
}
} else {
_showShareCollectionDialog();
}
await _showShareCollectionDialog();
},
),
),
@ -246,11 +246,21 @@ class _GalleryAppBarWidgetState extends State<GalleryAppBarWidget> {
}
}
Future<bool> _collectionHasHiddenFiles(int collectionID) async {
Future<bool> _shouldShowHiddenFilesWarning(Collection collection) async {
// collection can be null for device folders which are not marked for
// back up
if (!FeatureFlagService.instance.isInternalUserOrDebugBuild() ||
collection == null) {
return false;
}
// collection is already shared
if (collection.sharees.isNotEmpty || collection.publicURLs.isNotEmpty) {
return false;
}
final collectionIDsWithHiddenFiles =
await FilesDB.instance.getCollectionIDsOfHiddenFiles(
Configuration.instance.getUserID(),
);
return collectionIDsWithHiddenFiles.contains(collectionID);
return collectionIDsWithHiddenFiles.contains(collection.id);
}
}