mirror of
https://github.com/1f349/dendrite.git
synced 2024-11-09 22:42:58 +00:00
Fix panic when uploading keys (#1203)
We don't return OTK counts when the client doesn't upload OTKs.
This commit is contained in:
parent
84387e5249
commit
df8d6823ee
@ -82,10 +82,15 @@ func UploadKeys(req *http.Request, keyAPI api.KeyInternalAPI, device *userapi.De
|
||||
JSON: uploadRes.KeyErrors,
|
||||
}
|
||||
}
|
||||
keyCount := make(map[string]int)
|
||||
// we only return key counts when the client uploads OTKs
|
||||
if len(uploadRes.OneTimeKeyCounts) > 0 {
|
||||
keyCount = uploadRes.OneTimeKeyCounts[0].KeyCount
|
||||
}
|
||||
return util.JSONResponse{
|
||||
Code: 200,
|
||||
JSON: struct {
|
||||
OTKCounts interface{} `json:"one_time_key_counts"`
|
||||
}{uploadRes.OneTimeKeyCounts[0].KeyCount},
|
||||
}{keyCount},
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user