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

fix(GODT-2802): Consolidate Address Mode

Browse Source
This commit is contained in:
Leander Beernaert
2023-07-25 09:15:52 +02:00
parent 09c523e2d2
commit 1b0f930471
4 changed files with 58 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
internal/user/user.go
View File

@ -224,7 +224,7 @@ func New(
encVault,
user,
eventService,
vaultToSMTPAddressMode(encVault.AddressMode()),
usertypes.VaultToAddressMode(encVault.AddressMode()),
identityState.Clone(),
)
@ -402,7 +402,7 @@ func (user *User) SetAddressMode(ctx context.Context, mode vault.AddressMode) er
return fmt.Errorf("failed to set address mode: %w", err)
}
if err := user.smtpService.SetAddressMode(ctx, vaultToSMTPAddressMode(mode)); err != nil {
if err := user.smtpService.SetAddressMode(ctx, usertypes.VaultToAddressMode(mode)); err != nil {
return fmt.Errorf("failed to set smtp address mode: %w", err)
}
@ -917,15 +917,3 @@ func sleepCtx(ctx context.Context, d time.Duration) {
case <-time.After(d):
}
}
func vaultToSMTPAddressMode(mode vault.AddressMode) smtp.AddressMode {
var smtpAddressMode smtp.AddressMode
if mode == vault.SplitMode {
smtpAddressMode = smtp.AddressModeSplit
} else {
smtpAddressMode = smtp.AddressModeCombined
}
return smtpAddressMode
}