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

8
internal/services/smtp/smtp.go
View File

@ -160,7 +160,7 @@ func (s *Service) smtpSendMail(ctx context.Context, authID string, from string,
func (s *Service) sendWithKey(
ctx context.Context,
authAddrID string,
addrMode AddressMode,
addrMode usertypes.AddressMode,
settings proton.MailSettings,
userKR, addrKR *crypto.KeyRing,
emails []string,
@ -241,7 +241,7 @@ func getParentID(
ctx context.Context,
client *proton.Client,
authAddrID string,
addrMode AddressMode,
addrMode usertypes.AddressMode,
references []string,
) (string, error) {
var (
@ -263,7 +263,7 @@ func getParentID(
for _, internal := range internal {
var addrID string
if addrMode == AddressModeSplit {
if addrMode == usertypes.AddressModeSplit {
addrID = authAddrID
}
@ -291,7 +291,7 @@ func getParentID(
if parentID == "" && len(external) > 0 {
var addrID string
if addrMode == AddressModeSplit {
if addrMode == usertypes.AddressModeSplit {
addrID = authAddrID
}