self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-11-29 22:48:10 +02:00
Code Issues Releases Activity

All: Improved workflow of downloading and decrypting data during sync

Browse Source
This commit is contained in:
Laurent Cozic
2019-05-28 22:05:11 +01:00
parent 3ba021fdd9
commit 316a52bbc2
7 changed files with 54 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
ReactNativeClient/lib/BaseApplication.js
View File

@@ -59,6 +59,8 @@ class BaseApplication {
// be derived from the state and not set directly since that would make the
// state and UI out of sync.
this.currentFolder_ = null;
this.decryptionWorker_resourceMetadataButNotBlobDecrypted = this.decryptionWorker_resourceMetadataButNotBlobDecrypted.bind(this);
}
logger() {
@@ -285,6 +287,19 @@ class BaseApplication {
}
}
async decryptionWorker_resourceMetadataButNotBlobDecrypted(event) {
this.scheduleAutoAddResources();
}
scheduleAutoAddResources() {
if (this.scheduleAutoAddResourcesIID_) return;
this.scheduleAutoAddResourcesIID_ = setTimeout(() => {
this.scheduleAutoAddResourcesIID_ = null;
ResourceFetcher.instance().autoAddResources();
}, 1000);
}
reducerActionToString(action) {
let o = [action.type];
if ('id' in action) o.push(action.id);
@@ -314,7 +329,7 @@ class BaseApplication {
}
async generalMiddleware(store, next, action) {
this.logger().debug('Reducer action', this.reducerActionToString(action));
// this.logger().debug('Reducer action', this.reducerActionToString(action));
const result = next(action);
const newState = store.getState();
@@ -608,6 +623,7 @@ class BaseApplication {
DecryptionWorker.instance().setLogger(this.logger_);
DecryptionWorker.instance().setEncryptionService(EncryptionService.instance());
await EncryptionService.instance().loadMasterKeysFromSettings();
DecryptionWorker.instance().on('resourceMetadataButNotBlobDecrypted', this.decryptionWorker_resourceMetadataButNotBlobDecrypted);
ResourceFetcher.instance().setFileApi(() => { return reg.syncTarget().fileApi() });
ResourceFetcher.instance().setLogger(this.logger_);