From 76f3a97c76d83ed598c25fd27c91241af75a2a7c Mon Sep 17 00:00:00 2001 From: ashilkn Date: Fri, 3 Feb 2023 17:17:17 +0530 Subject: [PATCH 1/7] Disable gesutres when MenuItem is in success or inProgress state --- lib/ui/components/menu_item_widget/menu_item_widget.dart | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/lib/ui/components/menu_item_widget/menu_item_widget.dart b/lib/ui/components/menu_item_widget/menu_item_widget.dart index 4317dca96..093e61c54 100644 --- a/lib/ui/components/menu_item_widget/menu_item_widget.dart +++ b/lib/ui/components/menu_item_widget/menu_item_widget.dart @@ -210,6 +210,8 @@ class _MenuItemWidgetState extends State { } Future _onTap() async { + if (executionStateNotifier.value == ExecutionState.inProgress || + executionStateNotifier.value == ExecutionState.successful) return; _debouncer.run( () => Future( () { @@ -245,6 +247,8 @@ class _MenuItemWidgetState extends State { } void _onTapDown(details) { + if (executionStateNotifier.value == ExecutionState.inProgress || + executionStateNotifier.value == ExecutionState.successful) return; setState(() { if (widget.pressedColor == null) { hasPassedGestureCallbacks() @@ -261,6 +265,8 @@ class _MenuItemWidgetState extends State { } void _onTapUp(details) { + if (executionStateNotifier.value == ExecutionState.inProgress || + executionStateNotifier.value == ExecutionState.successful) return; Future.delayed( const Duration(milliseconds: 100), () => setState(() { @@ -270,6 +276,8 @@ class _MenuItemWidgetState extends State { } void _onCancel() { + if (executionStateNotifier.value == ExecutionState.inProgress || + executionStateNotifier.value == ExecutionState.successful) return; setState(() { menuItemColor = widget.menuItemColor; }); From 747c0132926ac77c0358e8ecc6477ee9ddb8e406 Mon Sep 17 00:00:00 2001 From: ashilkn Date: Fri, 3 Feb 2023 17:21:58 +0530 Subject: [PATCH 2/7] Fixed bug which comes when theme changes dynamically on MenuItem --- lib/ui/components/menu_item_widget/menu_item_widget.dart | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lib/ui/components/menu_item_widget/menu_item_widget.dart b/lib/ui/components/menu_item_widget/menu_item_widget.dart index 093e61c54..f89d60a85 100644 --- a/lib/ui/components/menu_item_widget/menu_item_widget.dart +++ b/lib/ui/components/menu_item_widget/menu_item_widget.dart @@ -129,6 +129,12 @@ class _MenuItemWidgetState extends State { super.didChangeDependencies(); } + @override + void didUpdateWidget(covariant MenuItemWidget oldWidget) { + menuItemColor = widget.menuItemColor; + super.didUpdateWidget(oldWidget); + } + @override void dispose() { if (widget.expandableController != null) { From 74fec9b99ac80a96fec6b559a9fbd8b8c6f68782 Mon Sep 17 00:00:00 2001 From: vishnukvmd Date: Mon, 6 Feb 2023 20:06:45 +0530 Subject: [PATCH 3/7] Update FDroid description --- .../metadata/android/en-US/full_description.txt | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/fastlane/metadata/android/en-US/full_description.txt b/fastlane/metadata/android/en-US/full_description.txt index 5ff407563..4719ffb07 100644 --- a/fastlane/metadata/android/en-US/full_description.txt +++ b/fastlane/metadata/android/en-US/full_description.txt @@ -1,21 +1,26 @@ -Ente is a simple app to automatically backup and organize your photos and videos. +ente is a simple app to backup and share your photos and videos. -If you've been looking for a privacy-friendly alternative to preserve your memories, you've come to the right place. With Ente, they are stored end-to-end encrypted (e2ee). This means that only you can view them. +If you've been looking for a privacy-friendly alternative to Google Photos, you've come to the right place. With Ente, they are stored end-to-end encrypted (e2ee). This means that only you can view them. -We have apps across Android, iOS, web and Desktop, and your photos will seamlessly sync between all your devices in an end-to-end encrypted (e2ee) manner. +We have apps across Android, iOS, web and desktop, and your photos will seamlessly sync between all of them in an end-to-end encrypted (e2ee) manner. -Ente also makes it simple to share your albums with your loved ones. You can either share them directly with other Ente users, end-to-end encrypted; or with publicly viewable links. +ente also makes it simple to share your albums with your loved ones, even if they aren't on ente. -Your encrypted data is stored across multiple locations, including a fall-out shelter in Paris. We take posterity seriously and make it easy to ensure that your memories outlive you. +You can share publicly viewable links, where they can view your album and collaborate by adding photos to it, even without an account or app. + +Your encrypted data is replicated to 3 different locations, including a fall-out shelter in Paris. We take posterity seriously and make it easy to ensure that your memories outlive you. We are here to make the safest photos app ever, come join our journey! FEATURES - Original quality backups, because every pixel is important - Family plans, so you can share storage with your family +- Collaborative albums, so you can pool together photos after a trip - Shared folders, in case you want your partner to enjoy your "Camera" clicks -- Album links, that can be protected with a password and set to expire +- Album links, that can be protected with a password - Ability to free up space, by removing files that have been safely backed up +- Human support, because you're worth it +- Descriptions, so you can caption your memories and find them easily - Image editor, to add finishing touches - Favorite, hide and relive your memories, for they are precious - One-click import from Google, Apple, your hard drive and more From df8ad5180121ac102e16e5f611b892437a32cacd Mon Sep 17 00:00:00 2001 From: Vishnu Mohandas Date: Tue, 7 Feb 2023 13:53:57 +0530 Subject: [PATCH 4/7] Fix case --- fastlane/metadata/android/en-US/full_description.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fastlane/metadata/android/en-US/full_description.txt b/fastlane/metadata/android/en-US/full_description.txt index 4719ffb07..0c0128174 100644 --- a/fastlane/metadata/android/en-US/full_description.txt +++ b/fastlane/metadata/android/en-US/full_description.txt @@ -1,6 +1,6 @@ ente is a simple app to backup and share your photos and videos. -If you've been looking for a privacy-friendly alternative to Google Photos, you've come to the right place. With Ente, they are stored end-to-end encrypted (e2ee). This means that only you can view them. +If you've been looking for a privacy-friendly alternative to Google Photos, you've come to the right place. With ente, they are stored end-to-end encrypted (e2ee). This means that only you can view them. We have apps across Android, iOS, web and desktop, and your photos will seamlessly sync between all of them in an end-to-end encrypted (e2ee) manner. @@ -29,7 +29,7 @@ FEATURES - and a LOT more! PERMISSIONS -Ente requests for certain permissions to serve the purpose of a photo storage provider, which can be reviewed here: https://github.com/ente-io/photos-app/blob/f-droid/android/permissions.md +ente requests for certain permissions to serve the purpose of a photo storage provider, which can be reviewed here: https://github.com/ente-io/photos-app/blob/f-droid/android/permissions.md PRICING We don't offer forever free plans, because it is important to us that we remain sustainable and withstand the test of time. Instead we offer affordable plans that you can freely share with your family. You can find more information at ente.io. From 683f7843bf1bf99351587490431b07e013322e78 Mon Sep 17 00:00:00 2001 From: Vishnu Mohandas Date: Tue, 7 Feb 2023 13:57:00 +0530 Subject: [PATCH 5/7] Update full_description.txt --- fastlane/metadata/android/en-US/full_description.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fastlane/metadata/android/en-US/full_description.txt b/fastlane/metadata/android/en-US/full_description.txt index 0c0128174..199c6b5f8 100644 --- a/fastlane/metadata/android/en-US/full_description.txt +++ b/fastlane/metadata/android/en-US/full_description.txt @@ -2,7 +2,7 @@ ente is a simple app to backup and share your photos and videos. If you've been looking for a privacy-friendly alternative to Google Photos, you've come to the right place. With ente, they are stored end-to-end encrypted (e2ee). This means that only you can view them. -We have apps across Android, iOS, web and desktop, and your photos will seamlessly sync between all of them in an end-to-end encrypted (e2ee) manner. +We have open-source apps across Android, iOS, web and desktop, and your photos will seamlessly sync between all of them in an end-to-end encrypted (e2ee) manner. ente also makes it simple to share your albums with your loved ones, even if they aren't on ente. From 9ad683615f4b394f66c5357e344fd02d4bf39bb0 Mon Sep 17 00:00:00 2001 From: Vishnu Mohandas Date: Tue, 7 Feb 2023 13:58:22 +0530 Subject: [PATCH 6/7] Remove newline --- fastlane/metadata/android/en-US/full_description.txt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/fastlane/metadata/android/en-US/full_description.txt b/fastlane/metadata/android/en-US/full_description.txt index 199c6b5f8..53cab6c96 100644 --- a/fastlane/metadata/android/en-US/full_description.txt +++ b/fastlane/metadata/android/en-US/full_description.txt @@ -4,9 +4,7 @@ If you've been looking for a privacy-friendly alternative to Google Photos, you' We have open-source apps across Android, iOS, web and desktop, and your photos will seamlessly sync between all of them in an end-to-end encrypted (e2ee) manner. -ente also makes it simple to share your albums with your loved ones, even if they aren't on ente. - -You can share publicly viewable links, where they can view your album and collaborate by adding photos to it, even without an account or app. +ente also makes it simple to share your albums with your loved ones, even if they aren't on ente. You can share publicly viewable links, where they can view your album and collaborate by adding photos to it, even without an account or app. Your encrypted data is replicated to 3 different locations, including a fall-out shelter in Paris. We take posterity seriously and make it easy to ensure that your memories outlive you. From f3fe162b22437651c07001518962806bbfa499f2 Mon Sep 17 00:00:00 2001 From: Neeraj Gupta <254676+ua741@users.noreply.github.com> Date: Tue, 7 Feb 2023 13:58:39 +0530 Subject: [PATCH 7/7] Fix bug in mapping existingFilesInDifferentCollection --- lib/utils/file_uploader.dart | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/utils/file_uploader.dart b/lib/utils/file_uploader.dart index 5f8ce1509..ec1f6ece3 100644 --- a/lib/utils/file_uploader.dart +++ b/lib/utils/file_uploader.dart @@ -603,7 +603,9 @@ class FileUploader { // case c and d final File? fileExistsButDifferentCollection = existingUploadedFiles.firstWhereOrNull( - (e) => e.collectionID != toCollectionID, + (e) => + e.collectionID != toCollectionID && + (e.localID == null || e.localID == fileToUpload.localID), ); if (fileExistsButDifferentCollection != null) { _logger.fine(