self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2024-11-24 08:12:24 +02:00
Code Issues Releases Activity

Fixed document picker

Browse Source
This commit is contained in:
Laurent Cozic 2020-10-14 13:11:00 +01:00
parent cc889182b6
commit 6ff45ce485
1 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
ReactNativeClient/lib/components/screens/note.js
View File

@ -34,7 +34,7 @@ const { themeStyle, editorFont } = require('lib/components/global-style.js');
const { dialogs } = require('lib/dialogs.js');
const DialogBox = require('react-native-dialogbox').default;
const { NoteBodyViewer } = require('lib/components/note-body-viewer.js');
const { DocumentPicker, DocumentPickerUtil } = require('react-native-document-picker');
const DocumentPicker = require('react-native-document-picker').default;
const ImageResizer = require('react-native-image-resizer').default;
const shared = require('lib/components/shared/note-screen-shared.js');
// const ImagePicker = require('react-native-image-picker');
@ -479,19 +479,17 @@ class NoteScreenComponent extends BaseScreenComponent {
}
async pickDocument() {
return new Promise((resolve) => {
DocumentPicker.show({ filetype: [DocumentPickerUtil.allFiles()] }, (error, res) => {
if (error) {
// Also returns an error if the user doesn't pick a file
// so just resolve with null.
console.info('pickDocument error:', error);
resolve(null);
return;
}
resolve(res);
});
});
try {
const result = await DocumentPicker.pick();
return result;
} catch (error) {
if (DocumentPicker.isCancel(error)) {
console.info('pickDocument: user has cancelled');
return null;
} else {
throw error;
}
}
}
async imageDimensions(uri) {
@ -567,7 +565,7 @@ class NoteScreenComponent extends BaseScreenComponent {
async attachFile(pickerResponse, fileType) {
if (!pickerResponse) {
reg.logger().warn('Got no response from picker');
// User has cancelled
return;
}