From b4135c4bae7844d34d99be792043e248130018d7 Mon Sep 17 00:00:00 2001 From: Neil Alexander Date: Tue, 22 Feb 2022 14:11:19 +0000 Subject: [PATCH] Update check order --- keyserver/api/api.go | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/keyserver/api/api.go b/keyserver/api/api.go index a13697dd2..3c9c134ff 100644 --- a/keyserver/api/api.go +++ b/keyserver/api/api.go @@ -82,11 +82,14 @@ func (m1 *DeviceMessage) DeviceKeysEqual(m2 *DeviceMessage) (bool, error) { if m1.UserID != m2.UserID || m1.DeviceID != m2.DeviceID { 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 { - 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 }