mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-31 18:53:10 -06:00
Code Issues Packages Projects Releases Wiki Activity

Update check order

Browse source
This commit is contained in:
Neil Alexander 2022-02-22 14:11:19 +00:00
parent 309dd8e146
commit b4135c4bae
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
keyserver/api/api.go
View file

@ -82,11 +82,14 @@ func (m1 *DeviceMessage) DeviceKeysEqual(m2 *DeviceMessage) (bool, error) {
if m1.UserID != m2.UserID || m1.DeviceID != m2.DeviceID { if m1.UserID != m2.UserID || m1.DeviceID != m2.DeviceID {
return false, fmt.Errorf("different user ID or device ID") return false, fmt.Errorf("different user ID or device ID")
} }
if len(m1.KeyJSON) == 0 || len(m2.KeyJSON) == 0 {
return false, nil
}
if m1.DisplayName != m2.DisplayName { if m1.DisplayName != m2.DisplayName {
return false, nil return false, nil // different display names
}
if len(m1.KeyJSON) == 0 && len(m2.KeyJSON) == 0 {
return true, nil // both are empty
}
if len(m1.KeyJSON) == 0 || len(m2.KeyJSON) == 0 {
return false, nil // only one is empty
} }
return bytes.Equal(m1.KeyJSON, m2.KeyJSON), nil return bytes.Equal(m1.KeyJSON, m2.KeyJSON), nil
} }