self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-08-24 20:19:10 +02:00
Code Issues Releases Activity

Desktop,Mobile,Cli: Fixes #12648: Fix unshare action requires two syncs to be reflected locally (#12999)

Browse Source
This commit is contained in:
Henry Heino
2025-08-20 13:36:47 -07:00
committed by GitHub
parent 453b4705b1
commit e2fc056369
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
packages/lib/Synchronizer.ts
View File

@@ -445,6 +445,16 @@ export default class Synchronizer {
logger.error('Error indexing resources:', error);
}
// Before syncing, we run the share service maintenance, which is going
// to fetch share invitations and clear share_ids for unshared items, if any.
if (this.shareService_) {
try {
await this.shareService_.maintenance();
} catch (error) {
logger.error('Could not run share service maintenance:', error);
}
}
// Before synchronising make sure all share_id properties are set
// correctly so as to share/unshare the right items.
try {
@@ -1158,16 +1168,6 @@ export default class Synchronizer {
this.cancelling_ = false;
}
// After syncing, we run the share service maintenance, which is going
// to fetch share invitations, if any.
if (this.shareService_) {
try {
await this.shareService_.maintenance();
} catch (error) {
logger.error('Could not run share service maintenance:', error);
}
}
this.progressReport_.completedTime = time.unixMs();
this.logSyncOperation('finished', null, null, `Synchronisation finished [${synchronizationId}]`);