Skip to content
Snippets Groups Projects
Commit 8bb4192c authored by Niamh Nikali's avatar Niamh Nikali
Browse files

Put sender ID in keyfp field into valid ID when receiving

parent 18ab679f
Branches
Tags
No related merge requests found
......@@ -278,7 +278,7 @@ func (rm *ReceptionManager) decryptMessages(session user.Session,
}
keyFP := msg.AssociatedData.GetKeyFP()
sender, err = id.Unmarshal(keyFP[:])
sender, err = makeUserID(keyFP[:])
} else {
sender, rekey, err = handleE2EReceiving(session, msg)
......@@ -314,6 +314,17 @@ func broadcastMessageReception(message *parse.Message,
listeners.Speak(message)
}
// Put a sender ID in a byte slice and set its type to user
func makeUserID(senderID []byte) (*id.ID, error) {
senderIDBytes := make([]byte, id.ArrIDLen)
copy(senderIDBytes, senderID[:])
userID, err := id.Unmarshal(senderIDBytes)
if userID != nil {
userID.SetType(id.User)
}
return userID, err
}
// skipErrChecker checks checks if the error is fatal or should be ignored
func skipErrChecker(err error) bool {
if strings.Contains(err.Error(), "Could not find any message IDs for this user") {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment