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: Fixes #1694: When deleting resource from sync target also delete associated data blob

Browse Source
This commit is contained in:
Laurent Cozic
2019-07-13 15:57:53 +01:00
parent 85bf89fd97
commit ec1089870f
3 changed files with 38 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ReactNativeClient/lib/synchronizer.js
View File

@ -223,6 +223,10 @@ class Synchronizer {
this.dispatch({ type: "SYNC_HAS_DISABLED_SYNC_ITEMS" });
}
const resourceRemotePath = resourceId => {
return this.resourceDirName_ + "/" + resourceId;
}
try {
await this.api().mkdir(this.syncDirName_);
this.api().setTempDirName(this.syncDirName_);
@ -330,7 +334,7 @@ class Synchronizer {
action = null;
} else {
try {
const remoteContentPath = this.resourceDirName_ + "/" + local.id;
const remoteContentPath = resourceRemotePath(local.id);
const result = await Resource.fullPathForSyncUpload(local);
local = result.resource;
const localResourceContentPath = result.path;
@ -461,6 +465,12 @@ class Synchronizer {
let path = BaseItem.systemPath(item.item_id);
this.logSyncOperation("deleteRemote", null, { id: item.item_id }, "local has been deleted");
await this.api().delete(path);
if (item.item_type === BaseModel.TYPE_RESOURCE) {
const remoteContentPath = resourceRemotePath(item.item_id);
await this.api().delete(remoteContentPath);
}
await BaseItem.remoteDeletedItem(syncTargetId, item.item_id);
}
} // DELETE_REMOTE STEP