thek0tyara/nheko
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Get rid of 'using json = nlohmann::json'

Browse source
This commit is contained in:
Nicolas Werner 2022-06-17 22:03:54 +02:00
parent b0c353c550
commit 8cdfbf9391
No known key found for this signature in database
GPG key ID: C8D75E610773F2D9
10 changed files with 198 additions and 187 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/encryption/DeviceVerificationFlow.cpp
View file

@ -267,7 +267,7 @@ DeviceVerificationFlow::DeviceVerificationFlow(QObject *,
// verified it
for (const auto &mac : msg.mac) {
if (their_keys.master_keys.keys.count(mac.first)) {
json j = their_keys.master_keys;
nlohmann::json j = their_keys.master_keys;
j.erase("signatures");
j.erase("unsigned");
mtx::crypto::CrossSigningKeys master_key =
@ -283,7 +283,7 @@ DeviceVerificationFlow::DeviceVerificationFlow(QObject *,
auto device_id = this->deviceId.toStdString();
if (their_keys.device_keys.count(device_id)) {
json j = their_keys.device_keys.at(device_id);
nlohmann::json j = their_keys.device_keys.at(device_id);
j.erase("signatures");
j.erase("unsigned");
@ -305,7 +305,7 @@ DeviceVerificationFlow::DeviceVerificationFlow(QObject *,
// Sign their master key with user signing key
for (const auto &mac : msg.mac) {
if (their_keys.master_keys.keys.count(mac.first)) {
json j = their_keys.master_keys;
nlohmann::json j = their_keys.master_keys;
j.erase("signatures");
j.erase("unsigned");