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

Desktop, Mobile: Fixes #9157: Clear "Some items cannot be synchronised" banner after situation is resolved

Browse Source
This commit is contained in:
Laurent Cozic
2024-01-27 16:59:19 +00:00
parent e4854b0bc2
commit 149e409bfa
9 changed files with 50 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/lib/Synchronizer.ts
View File

@@ -31,6 +31,7 @@ import resourceRemotePath from './services/synchronizer/utils/resourceRemotePath
import syncDeleteStep from './services/synchronizer/utils/syncDeleteStep';
import { ErrorCode } from './errors';
import { SyncAction } from './services/synchronizer/utils/types';
import checkDisabledSyncItemsNotification from './services/synchronizer/utils/checkDisabledSyncItemsNotification';
const { sprintf } = require('sprintf-js');
const { Dirnames } = require('./services/synchronizer/utils/types');
@@ -405,7 +406,6 @@ export default class Synchronizer {
const handleCannotSyncItem = async (ItemClass: any, syncTargetId: any, item: any, cannotSyncReason: string, itemLocation: any = null) => {
await ItemClass.saveSyncDisabled(syncTargetId, item, cannotSyncReason, itemLocation);
this.dispatch({ type: 'SYNC_HAS_DISABLED_SYNC_ITEMS' });
};
// We index resources before sync mostly to flag any potential orphan
@@ -1127,6 +1127,8 @@ export default class Synchronizer {
withErrors: Synchronizer.reportHasErrors(this.progressReport_),
});
await checkDisabledSyncItemsNotification((action: any) => this.dispatch(action));
this.onProgress_ = function() {};
this.progressReport_ = {};