mirror of
https://github.com/ProtonMail/proton-bridge.git
synced 2025-12-11 13:16:53 +00:00
fix(GODT-2326): Only run sync after addIMAPUser()
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:
@ -172,6 +172,7 @@ func (bridge *Bridge) addIMAPUser(ctx context.Context, user *user.User) error {
|
||||
}
|
||||
}
|
||||
|
||||
user.TriggerSync()
|
||||
return nil
|
||||
}
|
||||
|
||||
|
||||
@ -234,12 +234,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 {
|
||||
@ -482,11 +483,8 @@ func (user *User) GetSyncStatus() vault.SyncStatus {
|
||||
return user.vault.GetSyncStatus()
|
||||
}
|
||||
|
||||
// ClearSyncStatus clears the sync status of the user. This triggers a resync.
|
||||
// ClearSyncStatus clears the sync status of the user.
|
||||
func (user *User) ClearSyncStatus() error {
|
||||
user.abortable.Abort()
|
||||
defer user.goSync()
|
||||
|
||||
return user.vault.ClearSyncStatus()
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user