self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-02-01 19:15:01 +02:00
Code Issues Releases Activity

Mobile: Resolves #10092: Added empty trash option on long pressing the trash folder (#10120)

Browse Source
This commit is contained in:
Siddhant Paritosh Rao 2024-03-15 00:12:58 +05:30 committed by GitHub
parent 04298f0eba
commit b9eb4522f5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
packages/app-mobile/components/side-menu-content.tsx
View File

@ -16,6 +16,7 @@ import { reg } from '@joplin/lib/registry';
import { ProfileConfig } from '@joplin/lib/services/profileConfig/types'; import { ProfileConfig } from '@joplin/lib/services/profileConfig/types';
import { getTrashFolderIcon, getTrashFolderId } from '@joplin/lib/services/trash'; import { getTrashFolderIcon, getTrashFolderId } from '@joplin/lib/services/trash';
import restoreItems from '@joplin/lib/services/trash/restoreItems'; import restoreItems from '@joplin/lib/services/trash/restoreItems';
import emptyTrash from '@joplin/lib/services/trash/emptyTrash';
import { ModelType } from '@joplin/lib/BaseModel'; import { ModelType } from '@joplin/lib/BaseModel';
const { substrWithEllipsis } = require('@joplin/lib/string-utils'); const { substrWithEllipsis } = require('@joplin/lib/string-utils');
@ -146,11 +147,30 @@ const SideMenuContentComponent = (props: Props) => {
const folder = folderOrAll as FolderEntity; const folder = folderOrAll as FolderEntity;
if (folder && folder.id === getTrashFolderId()) return;
const menuItems: any[] = []; const menuItems: any[] = [];
if (folder && !!folder.deleted_time) { if (folder && folder.id === getTrashFolderId()) {
menuItems.push({
text: _('Empty trash'),
onPress: async () => {
Alert.alert('', _('This will permanently delete all items in the trash. Continue?'), [
{
text: _('Empty trash'),
onPress: async () => {
await emptyTrash();
},
},
{
text: _('Cancel'),
onPress: () => { },
style: 'cancel',
},
]);
},
style: 'destructive',
});
} else if (folder && !!folder.deleted_time) {
menuItems.push({ menuItems.push({
text: _('Restore'), text: _('Restore'),
onPress: async () => { onPress: async () => {