Apply suggestions

quotient-im · Sep 10, 2023 · 2a6b6a7 · 2a6b6a7
1 parent 7cc5954
commit 2a6b6a7
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 609 deletions.
diff --git a/Quotient/connectionencryptiondata_p.cpp b/Quotient/connectionencryptiondata_p.cpp
@@ -590,9 +590,8 @@ void ConnectionEncryptionData::handleQueryKeys(const QHash<QString, QHash<QStrin
     // events so a small corner-cutting should be fine.
     std::erase_if(pendingEncryptedEvents,
                   [this](const event_ptr_tt<EncryptedEvent>& pendingEvent) {
-                      if (!isKnownCurveKey(
-                              pendingEvent->fullJson()[SenderKey].toString(),
-                              pendingEvent->contentPart<QString>(SenderKey)))
+                      if (!isKnownCurveKey(pendingEvent->senderId(),
+                                           pendingEvent->senderKey()))
                           return false;
                       handleEncryptedToDeviceEvent(*pendingEvent);
                       return true;

diff --git a/Quotient/keyverificationsession.cpp b/Quotient/keyverificationsession.cpp
@@ -56,7 +56,7 @@ KeyVerificationSession::KeyVerificationSession(
     , m_remoteSupportedMethods(event.methods())
 {
     if (connection->hasConflictingDeviceIdsAndCrossSigningKeys(m_remoteUserId)) {
-        qWarning() << "Remote user has conflicting device ids and cross signing keys and device ids; refusing to verify.";
+        qWarning() << "Remote user has conflicting device ids and cross signing keys; refusing to verify.";
         return;
     }
     const auto& currentTime = QDateTime::currentDateTime();
@@ -78,7 +78,7 @@ KeyVerificationSession::KeyVerificationSession(QString userId, QString deviceId,
     , m_encrypted(false)
 {
     if (connection->hasConflictingDeviceIdsAndCrossSigningKeys(m_remoteUserId)) {
-        qWarning() << "Remote user has conflicting device ids and cross signing keys and device ids; refusing to verify.";
+        qWarning() << "Remote user has conflicting device ids and cross signing keys; refusing to verify.";
         return;
     }
     setupTimeout(600s);