π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
[mobile][photos] Rename system trash references
Priyanshu Dangare23e5733c27ec
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 8446009587..bfb7442ea0 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@@ -1092,11 +1092,11 @@ class _FileSelectionActionsWidgetState}void _restore() {- final isSystemOnly = widget.selectedFiles.files.every(- (f) => f.isSystemOnlyTrashFile,+ final isDeviceOnly = widget.selectedFiles.files.every(+ (f) => f.isDeviceOnlyTrashFile,);- if (isSystemOnly) {- _restoreFilesFromSystemTrash(widget.selectedFiles).onError((e, s) {+ if (isDeviceOnly) {+ _restoreFilesFromDeviceTrash(widget.selectedFiles).onError((e, s) {if (!mounted) return;showGenericErrorDialog(context: context, error: e).ignore();});@@ -1110,11 +1110,11 @@ class _FileSelectionActionsWidgetState}Future<void> _permanentlyDeleteFromTrash() async {- final isSystemOnly = widget.selectedFiles.files.every(- (f) => f.isSystemOnlyTrashFile,+ final isDeviceOnly = widget.selectedFiles.files.every(+ (f) => f.isDeviceOnlyTrashFile,);- if (isSystemOnly) {- await permanentlyDeleteFromSystemTrash(context, widget.selectedFiles);+ if (isDeviceOnly) {+ await permanentlyDeleteFromDeviceTrash(context, widget.selectedFiles);return;}if (await deleteFromEnteTrash(@@ -1307,7 +1307,7 @@ class _FileSelectionActionsWidgetState}}-Future<void> _restoreFilesFromSystemTrash(SelectedFiles selectedFiles) async {+Future<void> _restoreFilesFromDeviceTrash(SelectedFiles selectedFiles) async {final files = selectedFiles.files.map(trashFileToAssetEntity).toList();final restoredIDs = <String>{};try {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 c17e1c89df..7a7d2f4473 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@@ -242,8 +242,8 @@ class FileBottomBarState extends State<FileBottomBar> {child: IconButton(icon: const Icon(CupertinoIcons.gobackward, color: Colors.white),onPressed: () {- if (widget.file.isSystemOnlyTrashFile) {- _restoreFromSystemTrash().onError((e, s) {+ if (widget.file.isDeviceOnlyTrashFile) {+ _restoreFromDeviceTrash().onError((e, s) {if (!mounted) return;showGenericErrorDialog(context: context, error: e).ignore();});@@ -276,7 +276,7 @@ class FileBottomBarState extends State<FileBottomBar> {if (widget.file.isDeviceTrash) {final selectedFiles = SelectedFiles()..toggleSelection(widget.file);- await permanentlyDeleteFromSystemTrash(context, selectedFiles);+ await permanentlyDeleteFromDeviceTrash(context, selectedFiles);if (selectedFiles.files.isEmpty) {await widget.onFileRemoved(widget.file);}@@ -328,7 +328,7 @@ class FileBottomBarState extends State<FileBottomBar> {);}- Future<void> _restoreFromSystemTrash() async {+ Future<void> _restoreFromDeviceTrash() async {final asset = trashFileToAssetEntity(widget.file);final restoredIDs = await PhotoManager.editor.android.restoreFromTrash([asset,diff --git a/mobile/apps/photos/lib/ui/viewer/file/file_details_widget.dart b/mobile/apps/photos/lib/ui/viewer/file/file_details_widget.dartindex f0e4fa99b8..db57a6c831 100644--- a/mobile/apps/photos/lib/ui/viewer/file/file_details_widget.dart+++ b/mobile/apps/photos/lib/ui/viewer/file/file_details_widget.dart@@ -103,7 +103,7 @@ class _FileDetailsWidgetState extends State<FileDetailsWidget> {}});- if (!widget.file.isSystemOnlyTrashFile) {+ if (!widget.file.isDeviceOnlyTrashFile) {if (_isImage) {_exifNotifier.addListener(() {if (_exifNotifier.value != null) {@@ -231,7 +231,7 @@ class _FileDetailsWidgetState extends State<FileDetailsWidget> {]);}- if (_isImage && !file.isSystemOnlyTrashFile) {+ if (_isImage && !file.isDeviceOnlyTrashFile) {fileDetailsTiles.addAll([MenuGroupComponent(items: [@@ -260,7 +260,7 @@ class _FileDetailsWidgetState extends State<FileDetailsWidget> {_exifData,_currentUserID,),- if (flagService.internalUser && !file.isSystemOnlyTrashFile)+ if (flagService.internalUser && !file.isDeviceOnlyTrashFile)ValueListenableBuilder(valueListenable: _videoMetadataNotifier,builder: (context, value, _) => VideoExifRowItem(file, value),diff --git a/mobile/apps/photos/lib/ui/viewer/file/zoomable_image.dart b/mobile/apps/photos/lib/ui/viewer/file/zoomable_image.dartindex 40997deb59..6e9eefe471 100644--- a/mobile/apps/photos/lib/ui/viewer/file/zoomable_image.dart+++ b/mobile/apps/photos/lib/ui/viewer/file/zoomable_image.dart@@ -391,7 +391,7 @@ class _ZoomableImageState extends State<ZoomableImage> {if (!_loadingFinalImage &&!_loadedFinalImage &&- !_photo.isSystemOnlyTrashFile) {+ !_photo.isDeviceOnlyTrashFile) {_loadingFinalImage = true;getFile(_photo,diff --git a/mobile/apps/photos/lib/ui/viewer/gallery/trash_page.dart b/mobile/apps/photos/lib/ui/viewer/gallery/trash_page.dartindex cae2e89dec..2a3be848c9 100644--- a/mobile/apps/photos/lib/ui/viewer/gallery/trash_page.dart+++ b/mobile/apps/photos/lib/ui/viewer/gallery/trash_page.dart@@ -37,9 +37,9 @@ Future<void> showTrashPage(BuildContext context) async {}class _TrashPage extends StatefulWidget {- final bool _isSystemTrashSupported;+ final bool _isDeviceTrashSupported;- const _TrashPage(this._isSystemTrashSupported);+ const _TrashPage(this._isDeviceTrashSupported);@overrideState<_TrashPage> createState() => _TrashPageState();@@ -52,7 +52,7 @@ class _TrashPageState extends State<_TrashPage> {@overrideWidget build(BuildContext context) {final l10n = context.strings;- final header = (isLocalGalleryMode || !widget._isSystemTrashSupported)+ final header = (isLocalGalleryMode || !widget._isDeviceTrashSupported)? null: Padding(padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),@@ -172,7 +172,7 @@ class _TrashPageState extends State<_TrashPage> {createdAt: trash.deleteBy - const Duration(days: 30).inMicroseconds,updateAt: trash.deleteBy - const Duration(days: 30).inMicroseconds,deleteBy: trash.deleteBy,- isSystemOnly: true,+ isDeviceOnly: true,),);}diff --git a/mobile/apps/photos/lib/utils/delete_file_util.dart b/mobile/apps/photos/lib/utils/delete_file_util.dartindex 1b517b9d6b..c416f9d141 100644--- a/mobile/apps/photos/lib/utils/delete_file_util.dart+++ b/mobile/apps/photos/lib/utils/delete_file_util.dart@@ -1355,13 +1355,13 @@ class _DeleteConfirmationSheetState extends State<_DeleteConfirmationSheet> {}}-Future<void> permanentlyDeleteFromSystemTrash(+Future<void> permanentlyDeleteFromDeviceTrash(BuildContext context,SelectedFiles selectedFiles,) async {if (!await PhotoManager.canManageMedia()) {try {- await _deleteFromSystemTrash(selectedFiles);+ await _deleteFromDeviceTrash(selectedFiles);} catch (e) {if (context.mounted) {await showGenericErrorDialog(context: context, error: e);@@ -1372,7 +1372,7 @@ Future<void> permanentlyDeleteFromSystemTrash(final actionResult = await showBottomSheetComponent<ButtonResult>(context: context,builder: (_) => PermanentlyDeleteConfirmationSheet(- onDelete: () => _deleteFromSystemTrash(selectedFiles),+ onDelete: () => _deleteFromDeviceTrash(selectedFiles),),);if (actionResult?.action == ButtonAction.error && context.mounted) {@@ -1387,7 +1387,7 @@ Future<void> permanentlyDeleteFromSystemTrash(}}-Future<void> _deleteFromSystemTrash(SelectedFiles selectedFiles) async {+Future<void> _deleteFromDeviceTrash(SelectedFiles selectedFiles) async {final fileIDs = selectedFiles.files.map((f) => f.localID!).toList();final deletedIDs = <String>{};try {