tileradotorg/mautrix-whatsapp
1
0
Fork 0
forked from MirrorHub/mautrix-whatsapp
Code Pull requests Activity

Call EncryptMegolmEvent with pointer to content

Browse source
This commit is contained in:
Tulir Asokan 2020-06-18 12:57:55 +03:00
parent beed19fdad
commit 9d6b9a901d
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
crypto.go
View file

@ -131,7 +131,7 @@ func (helper *CryptoHelper) Decrypt(evt *event.Event) (*event.Event, error) {
} }
func (helper *CryptoHelper) Encrypt(roomID id.RoomID, evtType event.Type, content event.Content) (*event.EncryptedEventContent, error) { func (helper *CryptoHelper) Encrypt(roomID id.RoomID, evtType event.Type, content event.Content) (*event.EncryptedEventContent, error) {
encrypted, err := helper.mach.EncryptMegolmEvent(roomID, evtType, content) encrypted, err := helper.mach.EncryptMegolmEvent(roomID, evtType, &content)
if err != nil { if err != nil {
if err != crypto.SessionExpired && err != crypto.SessionNotShared && err != crypto.NoGroupSession { if err != crypto.SessionExpired && err != crypto.SessionNotShared && err != crypto.NoGroupSession {
return nil, err return nil, err
@ -145,7 +145,7 @@ func (helper *CryptoHelper) Encrypt(roomID id.RoomID, evtType event.Type, conten
if err != nil { if err != nil {
return nil, errors.Wrap(err, "failed to share group session") return nil, errors.Wrap(err, "failed to share group session")
} }
encrypted, err = helper.mach.EncryptMegolmEvent(roomID, evtType, content) encrypted, err = helper.mach.EncryptMegolmEvent(roomID, evtType, &content)
if err != nil { if err != nil {
return nil, errors.Wrap(err, "failed to encrypt event after re-sharing group session") return nil, errors.Wrap(err, "failed to encrypt event after re-sharing group session")
} }