self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-06-15 23:00:36 +02:00
Code Issues Releases Activity

All: Make sure existing resources are encrypted once E2EE has been enabled

Browse Source
This commit is contained in:
Laurent Cozic
2017-12-20 19:43:43 +00:00
parent edbff5a26a
commit 7750b954fc
2 changed files with 42 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ReactNativeClient/lib/synchronizer.js
View File

@ -270,7 +270,7 @@ class Synchronizer {
this.dispatch({ type: 'SYNC_HAS_DISABLED_SYNC_ITEMS' });
}
if (local.type_ == BaseModel.TYPE_RESOURCE && (action == 'createRemote' || (action == 'itemConflict' && remote))) {
if (local.type_ == BaseModel.TYPE_RESOURCE && (action == 'createRemote' || action === 'updateRemote' || (action == 'itemConflict' && remote))) {
try {
const remoteContentPath = this.resourceDirName_ + '/' + local.id;
const result = await Resource.fullPathForSyncUpload(local);