π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
[mobile][photos] implement restore from system actions
Priyanshu Dangaree09d88e9c35e
diff --git a/mobile/apps/photos/lib/models/file/trash_file.dart b/mobile/apps/photos/lib/models/file/trash_file.dartindex adbca99b9f..add06b7818 100644--- a/mobile/apps/photos/lib/models/file/trash_file.dart+++ b/mobile/apps/photos/lib/models/file/trash_file.dart@@ -1,4 +1,7 @@+import "package:photo_manager/photo_manager.dart";+import "package:photos/models/file/extensions/file_props.dart";import 'package:photos/models/file/file.dart';+import "package:photos/models/file/file_type.dart";sealed class TrashFile extends EnteFile {TrashFile();@@ -29,3 +32,16 @@ class EnteTrashFile extends TrashFile {class DeviceTrashFile extends TrashFile {DeviceTrashFile();}++AssetEntity trashFileToAssetEntity(EnteFile file) {+ return AssetEntity(+ id: file.asTrashFile!.systemTrashID!.toString(),+ typeInt: switch (file.fileType) {+ FileType.image || FileType.livePhoto => AssetType.image.index,+ FileType.video => AssetType.video.index,+ FileType.other => AssetType.other.index,+ },+ width: 0,+ height: 0,+ );+}diff --git a/mobile/apps/photos/lib/ui/settings/backup/free_space_options.dart b/mobile/apps/photos/lib/ui/settings/backup/free_space_options.dartindex 856ac99bc6..eafbc38cc1 100644--- a/mobile/apps/photos/lib/ui/settings/backup/free_space_options.dart+++ b/mobile/apps/photos/lib/ui/settings/backup/free_space_options.dart@@ -58,7 +58,7 @@ class _FreeUpSpaceOptionsScreenState extends State<FreeUpSpaceOptionsScreen> {l10n.authToViewTrashedFiles,);if (!hasAuthenticated || !context.mounted) return;- await routeToPage(context, TrashPage());+ await showTrashPage(context);},),const SizedBox(height: Spacing.sm),diff --git a/mobile/apps/photos/lib/ui/tabs/albums/albums_manage_sheet.dart b/mobile/apps/photos/lib/ui/tabs/albums/albums_manage_sheet.dartindex 8f6fb99036..47ac30e85c 100644--- a/mobile/apps/photos/lib/ui/tabs/albums/albums_manage_sheet.dart+++ b/mobile/apps/photos/lib/ui/tabs/albums/albums_manage_sheet.dart@@ -116,7 +116,7 @@ Future<void> showAlbumsManageSheet(BuildContext context) {if (sheetContext.mounted) {Navigator.of(sheetContext).pop();}- unawaited(routeToPage(context, const TrashPage()));+ await showTrashPage(context);},),],diff --git a/mobile/apps/photos/lib/ui/viewer/actions/file_selection_actions_widget.dart b/mobile/apps/photos/lib/ui/viewer/actions/file_selection_actions_widget.dartindex 53739957df..8e12fa7a8f 100644--- a/mobile/apps/photos/lib/ui/viewer/actions/file_selection_actions_widget.dart+++ b/mobile/apps/photos/lib/ui/viewer/actions/file_selection_actions_widget.dart@@ -9,15 +9,19 @@ import "package:hugeicons/hugeicons.dart";import "package:local_auth/local_auth.dart";import "package:logging/logging.dart";import "package:modal_bottom_sheet/modal_bottom_sheet.dart";+import "package:photo_manager/photo_manager.dart";import 'package:photos/core/configuration.dart';import "package:photos/core/event_bus.dart";import "package:photos/events/files_updated_event.dart";+import "package:photos/events/force_reload_trash_page_event.dart";import "package:photos/events/guest_view_event.dart";import "package:photos/events/people_changed_event.dart";import 'package:photos/models/collection/collection.dart';import 'package:photos/models/device_collection.dart';+import "package:photos/models/file/extensions/file_props.dart";import 'package:photos/models/file/file.dart';import 'package:photos/models/file/file_type.dart';+import "package:photos/models/file/trash_file.dart";import 'package:photos/models/files_split.dart';import 'package:photos/models/gallery_type.dart';import "package:photos/models/metadata/common_keys.dart";@@ -1066,6 +1070,16 @@ class _FileSelectionActionsWidgetState}void _restore() {+ final isSystemOnly = widget.selectedFiles.files.every(+ (f) => f.asTrashFile!.isSystemOnly,+ );+ if (isSystemOnly) {+ _restoreFilesFromSystemTrash(widget.selectedFiles).onError((e, s) {+ if (!mounted) return;+ showGenericErrorDialog(context: context, error: e).ignore();+ });+ return;+ }showCollectionActionSheet(context,selectedFiles: widget.selectedFiles,@@ -1260,3 +1274,16 @@ class _FileSelectionActionsWidgetState}}}++Future<void> _restoreFilesFromSystemTrash(SelectedFiles selectedFiles) async {+ final assets = selectedFiles.files.map(trashFileToAssetEntity).toList();+ final restoredIDs = (await PhotoManager.editor.android.restoreFromTrash(+ assets,+ )).map(int.parse);+ if (restoredIDs.isEmpty) return;+ final restoredFiles = selectedFiles.files.where(+ (f) => restoredIDs.contains(f.asTrashFile!.systemTrashID!),+ );+ selectedFiles.unSelectAll(restoredFiles.toSet());+ Bus.instance.fire(ForceReloadTrashPageEvent());+}diff --git a/mobile/apps/photos/lib/ui/viewer/file/file_app_bar.dart b/mobile/apps/photos/lib/ui/viewer/file/file_app_bar.dartindex 3c7278c64a..b1afdfb2a3 100644--- a/mobile/apps/photos/lib/ui/viewer/file/file_app_bar.dart+++ b/mobile/apps/photos/lib/ui/viewer/file/file_app_bar.dart@@ -288,7 +288,10 @@ class FileAppBarState extends State<FileAppBar> {),);}- if (!isFileUploaded && !isLocalGalleryMode) {++ if (!isFileUploaded &&+ widget.file.asTrashFile == null &&+ !isLocalGalleryMode) {_actions.add(UploadIconWidget(file: widget.file, key: ValueKey(widget.file.tag)),);diff --git a/mobile/apps/photos/lib/ui/viewer/file/file_bottom_bar.dart b/mobile/apps/photos/lib/ui/viewer/file/file_bottom_bar.dartindex 121363c951..d55ebd2854 100644--- a/mobile/apps/photos/lib/ui/viewer/file/file_bottom_bar.dart+++ b/mobile/apps/photos/lib/ui/viewer/file/file_bottom_bar.dart@@ -6,7 +6,9 @@ import "package:flutter/cupertino.dart";import "package:flutter/material.dart";import "package:flutter_svg/flutter_svg.dart";import "package:hugeicons/hugeicons.dart";+import "package:photo_manager/photo_manager.dart";import "package:photos/core/event_bus.dart";+import "package:photos/events/force_reload_trash_page_event.dart";import "package:photos/events/guest_view_event.dart";import "package:photos/models/collection/collection.dart";import "package:photos/models/file/extensions/file_props.dart";@@ -21,6 +23,7 @@ import "package:photos/ui/actions/file/file_actions.dart";import "package:photos/ui/collections/collection_action_sheet.dart";import "package:photos/ui/viewer/actions/suggest_delete_sheet.dart";import "package:photos/utils/delete_file_util.dart";+import "package:photos/utils/dialog_util.dart";import "package:photos/utils/share_util.dart";class FileBottomBar extends StatefulWidget {@@ -239,6 +242,13 @@ class FileBottomBarState extends State<FileBottomBar> {child: IconButton(icon: const Icon(CupertinoIcons.gobackward, color: Colors.white),onPressed: () {+ if (widget.file.asTrashFile!.isSystemOnly) {+ _restoreFromSystemTrash().onError((e, s) {+ if (!mounted) return;+ showGenericErrorDialog(context: context, error: e).ignore();+ });+ return;+ }final selectedFiles = SelectedFiles();selectedFiles.toggleSelection(widget.file);showCollectionActionSheet(@@ -308,4 +318,14 @@ class FileBottomBarState extends State<FileBottomBar> {},);}++ Future<void> _restoreFromSystemTrash() async {+ final asset = trashFileToAssetEntity(widget.file);+ final restoredIDs = await PhotoManager.editor.android.restoreFromTrash([+ asset,+ ]);+ if (restoredIDs.isEmpty) return;+ Bus.instance.fire(ForceReloadTrashPageEvent());+ await widget.onFileRemoved(widget.file);+ }}diff --git a/mobile/apps/photos/lib/ui/viewer/gallery/trash_page.dart b/mobile/apps/photos/lib/ui/viewer/gallery/trash_page.dartindex aa6c65abe3..98b16afd63 100644--- a/mobile/apps/photos/lib/ui/viewer/gallery/trash_page.dart+++ b/mobile/apps/photos/lib/ui/viewer/gallery/trash_page.dart@@ -2,9 +2,11 @@ import "dart:io";import "package:collection/collection.dart";import "package:ente_components/ente_components.dart";+import "package:ente_pure_utils/ente_pure_utils.dart";import "package:ente_strings/extensions.dart";import 'package:flutter/material.dart';import "package:photo_manager/photo_manager.dart";+import "package:photos/core/constants.dart";import "package:photos/core/event_bus.dart";import "package:photos/db/trash_db.dart";import "package:photos/events/files_updated_event.dart";@@ -24,22 +26,33 @@ import "package:photos/ui/viewer/gallery/gallery_app_bar_widget.dart";import "package:photos/ui/viewer/gallery/state/gallery_boundaries_provider.dart";import "package:photos/ui/viewer/gallery/state/gallery_files_inherited_widget.dart";import "package:photos/ui/viewer/gallery/state/selection_state.dart";+import "package:photos/utils/device_info.dart";-class TrashPage extends StatefulWidget {- const TrashPage({super.key});+Future<void> showTrashPage(BuildContext context) async {+ final isDeviceTrashSupported =+ Platform.isAndroid &&+ !await isAndroidSDKVersionLowerThan(android11SDKINT);+ if (!context.mounted) return;+ await routeToPage(context, _TrashPage(isDeviceTrashSupported));+}++class _TrashPage extends StatefulWidget {+ final bool _isSystemTrashSupported;++ const _TrashPage(this._isSystemTrashSupported);@override- State<TrashPage> createState() => _TrashPageState();+ State<_TrashPage> createState() => _TrashPageState();}-class _TrashPageState extends State<TrashPage> {- bool _isOnEnteTrash = true;+class _TrashPageState extends State<_TrashPage> {+ bool _isOnEnteTrash = !isLocalGalleryMode;final _selectedFiles = SelectedFiles();@overrideWidget build(BuildContext context) {final l10n = context.strings;- final header = (isLocalGalleryMode || !Platform.isAndroid)+ final header = (isLocalGalleryMode || !widget._isSystemTrashSupported)? null: Padding(padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),@@ -50,18 +63,24 @@ class _TrashPageState extends State<TrashPage> {label: l10n.ente,state: _isOnEnteTrash ? .selected : .unselected,onTap: () {- setState(() {- _isOnEnteTrash = true;- });+ if (!_isOnEnteTrash) {+ setState(() {+ _selectedFiles.clearAll();+ _isOnEnteTrash = true;+ });+ }},),TagChipComponent(label: l10n.onDevice,state: !_isOnEnteTrash ? .selected : .unselected,onTap: () {- setState(() {- _isOnEnteTrash = false;- });+ if (_isOnEnteTrash) {+ setState(() {+ _selectedFiles.clearAll();+ _isOnEnteTrash = false;+ });+ }},),],@@ -130,7 +149,7 @@ class _TrashPageState extends State<TrashPage> {int? limit,bool? asc,}) async {- if (!Platform.isAndroid || (!isLocalGalleryMode && _isOnEnteTrash)) {+ if (_isOnEnteTrash) {return await TrashDB.instance.getTrashedFiles(creationStartTime,creationEndTime,