Skip to content

TagSpaces is an offline, open source, document manager with tagging support

Fix opening file or folder externally

Stanimirff5f5bb8601a
diff --git a/src/renderer/components/EntryContainerMenu.tsx b/src/renderer/components/EntryContainerMenu.tsx
index db5983d42..cb26f8ee4 100644
--- a/src/renderer/components/EntryContainerMenu.tsx
+++ b/src/renderer/components/EntryContainerMenu.tsx
@@ -330,7 +330,8 @@ function EntryContainerMenu(props: Props) {
currentLocation?.haveObjectStoreSupport() ||
currentLocation?.haveWebDavSupport() ||
AppConfig.isWeb
- )
+ ) &&
+ !(AppConfig.isAndroid && !openedEntry.isFile)
) {
menuItems.push(
<MenuItem
@@ -342,7 +343,13 @@ function EntryContainerMenu(props: Props) {
<ListItemIcon>
<OpenNativelyIcon />
</ListItemIcon>
- <ListItemText primary={t('core:openFileExternally')} />
+ <ListItemText
+ primary={t(
+ openedEntry.isFile
+ ? 'core:openFileNatively'
+ : 'core:openDirectoryExternally',
+ )}
+ />
</MenuItem>,
);
}
diff --git a/src/renderer/components/menus/FileMenu.tsx b/src/renderer/components/menus/FileMenu.tsx
index 91d5daf4b..57c813d82 100644
--- a/src/renderer/components/menus/FileMenu.tsx
+++ b/src/renderer/components/menus/FileMenu.tsx
@@ -351,23 +351,25 @@ function FileMenu(props: Props) {
<MenuKeyBinding keyBinding={keyBindings['openFileExternally']} />
</MenuItem>,
);
- menuItems.push(
- <MenuItem
- key="fileMenuOpenContainingFolder"
- data-tid="fileMenuOpenContainingFolder"
- onClick={() => {
- onClose();
- if (selectedFilePath) {
- openFileNatively(selectedFilePath);
- }
- }}
- >
- <ListItemIcon>
- <OpenFolderInternally />
- </ListItemIcon>
- <ListItemText primary={t('core:showInFileManager')} />
- </MenuItem>,
- );
+ if (!AppConfig.isAndroid) {
+ menuItems.push(
+ <MenuItem
+ key="fileMenuOpenContainingFolder"
+ data-tid="fileMenuOpenContainingFolder"
+ onClick={() => {
+ onClose();
+ if (selectedFilePath) {
+ openDirectoryMessage(selectedFilePath);
+ }
+ }}
+ >
+ <ListItemIcon>
+ <OpenFolderInternally />
+ </ListItemIcon>
+ <ListItemText primary={t('core:showInFileManager')} />
+ </MenuItem>,
+ );
+ }
menuItems.push(<Divider key="fmDivider" />);
}
if (!readOnlyMode) {