Silverfish/proton-bridge
1
0
Fork 1
mirror of https://github.com/ProtonMail/proton-bridge.git synced 2025-12-19 08:37:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: crash when removing account while messages are being returned

Browse Source
This commit is contained in:
James Houlahan
2020-05-19 09:04:30 +02:00
parent 4d2baa6b85
commit cb8a15a9fd
8 changed files with 60 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
pkg/pmapi/addresses.go
View File

@ -18,6 +18,7 @@
package pmapi
import (
"errors"
"fmt"
"strings"
@ -116,7 +117,7 @@ func (l AddressList) Main() *Address {
return addr
}
}
return l[0] // Should not happen.
return nil
}
// ByEmail gets an address by email. Returns nil if no address is found.
@ -218,10 +219,14 @@ func (c *client) UnlockAddresses(passphrase []byte) (err error) {
return
}
func (c *client) KeyRingForAddressID(addrID string) *pmcrypto.KeyRing {
addr := c.addresses.ByID(addrID)
if addr == nil {
addr = c.addresses.Main()
func (c *client) KeyRingForAddressID(addrID string) (*pmcrypto.KeyRing, error) {
if addr := c.addresses.ByID(addrID); addr != nil {
return addr.KeyRing(), nil
}
return addr.KeyRing()
if addr := c.addresses.Main(); addr != nil {
return addr.KeyRing(), nil
}
return nil, errors.New("no such address ID")
}