Skip to content

Android: Fix sharing items from Joplin #4718

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
laurent22 merged 10 commits into from
Apr 7, 2021
Merged

Android: Fix sharing items from Joplin #4718

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
4684b4c
Ensure shared file name is never empty
roman-r-m Mar 20, 2021
3c7752b
Copy the file to be shared into caches dir
roman-r-m Mar 20, 2021
8cd9d21
Do not delete shared files immediately as it breaks sharing to some a…
roman-r-m Mar 20, 2021
36a196c
Downgrade react-native-share to avoid a bug
roman-r-m Mar 21, 2021
4b368fa
Extract working with shared files to a separate file
roman-r-m Mar 21, 2021
0a789b3
Update package-lock.json
roman-r-m Mar 21, 2021
7c7cbfc
Update git/eslint ignores
roman-r-m Mar 21, 2021
677caef
Use the latest react-native-share with the bugfix
roman-r-m Mar 22, 2021
7f4cc18
Fix a typo
roman-r-m Mar 22, 2021
0a24ecb
Use existing method to get resource file name
roman-r-m Mar 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .eslintignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -730,6 +730,9 @@ packages/app-mobile/setUpQuickActions.js.map
packages/app-mobile/utils/ShareExtension.d.ts
packages/app-mobile/utils/ShareExtension.js
packages/app-mobile/utils/ShareExtension.js.map
packages/app-mobile/utils/ShareUtils.d.ts
packages/app-mobile/utils/ShareUtils.js
packages/app-mobile/utils/ShareUtils.js.map
packages/app-mobile/utils/checkPermissions.d.ts
packages/app-mobile/utils/checkPermissions.js
packages/app-mobile/utils/checkPermissions.js.map
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -717,6 +717,9 @@ packages/app-mobile/setUpQuickActions.js.map
packages/app-mobile/utils/ShareExtension.d.ts
packages/app-mobile/utils/ShareExtension.js
packages/app-mobile/utils/ShareExtension.js.map
packages/app-mobile/utils/ShareUtils.d.ts
packages/app-mobile/utils/ShareUtils.js
packages/app-mobile/utils/ShareUtils.js.map
packages/app-mobile/utils/checkPermissions.d.ts
packages/app-mobile/utils/checkPermissions.js
packages/app-mobile/utils/checkPermissions.js.map
Expand Down
14 changes: 3 additions & 11 deletions packages/app-mobile/components/NoteBodyViewer/hooks/useOnResourceLongPress.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
import { useCallback } from 'react';
import Setting from '@joplin/lib/models/Setting';
import shim from '@joplin/lib/shim';

const { ToastAndroid } = require('react-native');
const { _ } = require('@joplin/lib/locale.js');
import { reg } from '@joplin/lib/registry';
const { dialogs } = require('../../../utils/dialogs.js');
import Resource from '@joplin/lib/models/Resource';
import { copyToCache } from '../../../utils/ShareUtils';
const Share = require('react-native-share').default;

export default function useOnResourceLongPress(onJoplinLinkClick: Function, dialogBoxRef: any) {
Expand All @@ -24,21 +23,14 @@ export default function useOnResourceLongPress(onJoplinLinkClick: Function, dial
if (action === 'open') {
onJoplinLinkClick(`joplin://${resourceId}`);
} else if (action === 'share') {
const filename = resource.file_name ?
`${resource.file_name}.${resource.file_extension}` :
resource.title;
const targetPath = `${Setting.value('resourceDir')}/${filename}`;

await shim.fsDriver().copy(Resource.fullPath(resource), targetPath);
const fileToShare = await copyToCache(resource);

await Share.open({
type: resource.mime,
filename: resource.title,
url: `file://${targetPath}`,
url: `file://${fileToShare}`,
failOnCancel: false,
});

await shim.fsDriver().remove(targetPath);
}
} catch (e) {
reg.logger().error('Could not handle link long press', e);
Expand Down
Loading