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

fix: fallback to detecting charset if cannot handle specified one

Browse Source
This commit is contained in:
James Houlahan
2020-08-11 12:04:08 +02:00
parent 180c6699e0
commit 5343a6fc0f
1 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
pkg/message/parser/part.go
View File

@ -61,13 +61,11 @@ func (p *Part) ConvertToUTF8() error {
return err return err
} }
var decoder *encoding.Decoder decoder := selectDecoderFromParams(params)
if knownCharset, ok := params["charset"]; !ok { if decoder == nil {
encoding, _, _ := charset.DetermineEncoding(p.Body, t) encoding, _, _ := charset.DetermineEncoding(p.Body, t)
decoder = encoding.NewDecoder() decoder = encoding.NewDecoder()
} else if decoder, err = pmmime.SelectDecoder(knownCharset); err != nil {
return err
} }
if p.Body, err = decoder.Bytes(p.Body); err != nil { if p.Body, err = decoder.Bytes(p.Body); err != nil {
@ -78,9 +76,24 @@ func (p *Part) ConvertToUTF8() error {
if params == nil { if params == nil {
params = make(map[string]string) params = make(map[string]string)
} }
params["charset"] = "utf-8" params["charset"] = "utf-8"
p.Header.SetContentType(t, params) p.Header.SetContentType(t, params)
return nil return nil
} }
func selectDecoderFromParams(params map[string]string) *encoding.Decoder {
charset, ok := params["charset"]
if !ok {
return nil
}
decoder, err := pmmime.SelectDecoder(charset)
if err != nil {
return nil
}
return decoder
}