Silverfish/proton-bridge
1
0
Fork 1
mirror of https://github.com/ProtonMail/proton-bridge.git synced 2025-12-15 14:56:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(GODT-2326): Only run sync after addIMAPUser()

Browse Source 
There is concurrency bug due to competing sync calls that can occur when
we clear the sync status in the Vault. Running sync at the end of
addIMAPUser() avoids the problem.

This patch also remove the execution of a sync task for
`user.ClearSyncStatus()`
This commit is contained in:
Leander Beernaert
2023-02-02 11:19:32 +01:00
committed by Jakub
parent b17bdad864
commit 76d732f247
3 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
internal/user/user.go
View File

@ -232,12 +232,13 @@ func New(
})
})
// Trigger an initial sync (if necessary).
user.goSync()
return user, nil
}
func (user *User) TriggerSync() {
user.goSync()
}
// ID returns the user's ID.
func (user *User) ID() string {
return safe.RLockRet(func() string {
@ -475,11 +476,13 @@ func (user *User) OnStatusDown(context.Context) {
user.abortable.Abort()
}
// ClearSyncStatus clears the sync status of the user. This triggers a resync.
func (user *User) ClearSyncStatus() error {
user.abortable.Abort()
defer user.goSync()
// GetSyncStatus returns the sync status of the user.
func (user *User) GetSyncStatus() vault.SyncStatus {
return user.vault.GetSyncStatus()
}
// ClearSyncStatus clears the sync status of the user.
func (user *User) ClearSyncStatus() error {
return user.vault.ClearSyncStatus()
}