yesBad/proton-bridge
1
0
Fork 0
forked from Silverfish/proton-bridge
Code Actions Activity

chore(GODT-2442): improve naming, remove unrelated changes

Browse Source
This commit is contained in:
Jakub
2023-03-07 15:47:57 +01:00
parent 2c9477d65c
commit 86630ce137
10 changed files with 1152 additions and 489 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
internal/user/user.go
View File

@ -307,7 +307,7 @@ func (user *User) BadEventAbort() {
// BadEventFeedbackResync sends user feedback whether should do message re-sync.
func (user *User) BadEventFeedbackResync(ctx context.Context) {
if err := user.syncUserAddressesAndLabels(ctx); err != nil {
if err := user.syncUserAddressesLabelsAndClearSync(ctx); err != nil {
user.log.WithError(err).Error("Bad event resync failed")
}
}
@ -523,14 +523,6 @@ func (user *User) clearSyncStatus() error {
return nil
}
func (user *User) LockEvents() {
user.eventLock.Lock()
}
func (user *User) UnlockEvents() {
user.eventLock.Unlock()
}
// Logout logs the user out from the API.
func (user *User) Logout(ctx context.Context, withAPI bool) error {
user.log.WithField("withAPI", withAPI).Info("Logging out user")
@ -647,17 +639,6 @@ func (user *User) doEventPoll(ctx context.Context) error {
user.eventLock.Lock()
defer user.eventLock.Unlock()
eventID := user.vault.EventID()
if eventID == "" {
err := errors.New("current eventID is empty")
user.eventCh.Enqueue(events.UncategorizedEventError{ // this might be bad event.. I hope sync is ongoing
UserID: user.ID(),
Error: err,
})
return err
}
event, err := user.client.GetEvent(ctx, user.vault.EventID())
if err != nil {
return fmt.Errorf("failed to get event (caused by %T): %w", internal.ErrCause(err), err)