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

Mobile: Made saving notes more reliable

Browse Source
This commit is contained in:
Laurent Cozic 2020-06-09 23:30:32 +00:00
parent 31bce2e644
commit d80cf6bf37
2 changed files with 28 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ReactNativeClient/lib/AsyncActionQueue.ts
View File

@ -67,7 +67,13 @@ export default class AsyncActionQueue {
this.processing_ = false;
}
waitForAllDone() {
// Currently waitForAllDone() already finishes all the actions
// as quickly as possible so we can make it an alias.
async processAllNow() {
return this.waitForAllDone();
}
async waitForAllDone() {
if (!this.queue_.length) return Promise.resolve();
this.scheduleProcessing(1);

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

@ -1,4 +1,5 @@
import FileViewer from 'react-native-file-viewer';
import AsyncActionQueue from '../../AsyncActionQueue';
const React = require('react');
const { Platform, Clipboard, Keyboard, View, TextInput, StyleSheet, Linking, Image, Share } = require('react-native');
@ -74,6 +75,8 @@ class NoteScreenComponent extends BaseScreenComponent {
this.selection = null;
this.saveActionQueues_ = {};
this.markdownEditorRef = React.createRef(); // For focusing the Markdown editor
this.doFocusUpdate_ = false;
@ -349,6 +352,8 @@ class NoteScreenComponent extends BaseScreenComponent {
if (this.state.fromShare) {
ShareExtension.close();
}
this.saveActionQueue(this.state.note.id).processAllNow();
}
title_changeText(text) {
@ -362,15 +367,21 @@ class NoteScreenComponent extends BaseScreenComponent {
this.scheduleSave();
}
scheduleSave() {
if (this.scheduleSaveIID_) {
clearTimeout(this.scheduleSaveIID_);
this.scheduleSaveIID_ = null;
}
makeSaveAction() {
return async () => {
return shared.saveNoteButton_press(this);
};
}
this.scheduleSaveIID_ = setTimeout(async () => {
await shared.saveNoteButton_press(this);
}, 1000);
saveActionQueue(noteId) {
if (!this.saveActionQueues_[noteId]) {
this.saveActionQueues_[noteId] = new AsyncActionQueue(500);
}
return this.saveActionQueues_[noteId];
}
scheduleSave() {
this.saveActionQueue(this.state.note.id).push(this.makeSaveAction());
}
async saveNoteButton_press(folderId = null) {
@ -1044,7 +1055,8 @@ class NoteScreenComponent extends BaseScreenComponent {
const actionButtonComp = renderActionButton();
const showSaveButton = this.state.mode == 'edit' || this.isModified() || this.saveButtonHasBeenShown_;
// Save button is not really needed anymore with the improved save logic
const showSaveButton = false; // this.state.mode == 'edit' || this.isModified() || this.saveButtonHasBeenShown_;
const saveButtonDisabled = !this.isModified();
if (showSaveButton) this.saveButtonHasBeenShown_ = true;