Silverfish/proton-bridge
1
0
Fork 1
mirror of https://github.com/ProtonMail/proton-bridge.git synced 2025-12-15 14:56:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: hang when reloading keys

Browse Source
This commit is contained in:
James Houlahan
2020-06-22 10:19:13 +02:00
parent 012be60311
commit ec224a962f
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/pmapi/client.go
View File

@ -154,6 +154,12 @@ func (c *client) Unlock(passphrase []byte) (err error) {
c.keyRingLock.Lock()
defer c.keyRingLock.Unlock()
return c.unlock(passphrase)
}
// unlock unlocks the user's keys but without locking the keyring lock first.
// Should only be used internally by methods that first lock the lock.
func (c *client) unlock(passphrase []byte) (err error) {
if _, err = c.CurrentUser(); err != nil {
return
}
@ -181,7 +187,7 @@ func (c *client) ReloadKeys(passphrase []byte) (err error) {
c.clearKeys()
return c.Unlock(passphrase)
return c.unlock(passphrase)
}
func (c *client) clearKeys() {