From 5cf182fd4fed95e1a16936f400e8ff6fcf991d7c Mon Sep 17 00:00:00 2001
From: Tobias Fella <fella@posteo.de>
Date: Tue, 7 Dec 2021 19:18:35 +0100
Subject: Fixes

---
 lib/database.cpp | 2 +-
 lib/room.cpp     | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

(limited to 'lib')

diff --git a/lib/database.cpp b/lib/database.cpp
index e115b6c3..6acfbc74 100644
--- a/lib/database.cpp
+++ b/lib/database.cpp
@@ -115,7 +115,7 @@ void Database::setAccountPickle(const QString &matrixId, const QByteArray &pickl
 void Database::clear(const QString &matrixId)
 {
     QSqlQuery query;
-    query.prepare(QStringLiteral("DELETE FROM Accounts(matrixId, pickle) WHERE matrixId=:matrixId;"));
+    query.prepare(QStringLiteral("DELETE FROM Accounts WHERE matrixId=:matrixId;"));
     query.bindValue(":matrixId", matrixId);
 
     QSqlQuery sessionsQuery;
diff --git a/lib/room.cpp b/lib/room.cpp
index 755f677a..15cbac28 100644
--- a/lib/room.cpp
+++ b/lib/room.cpp
@@ -401,9 +401,9 @@ public:
         const auto senderSessionPairKey = qMakePair(senderKey, sessionId);
         auto groupSessionIt = groupSessions.find(senderSessionPairKey);
         if (groupSessionIt == groupSessions.end()) {
-            qCWarning(E2EE) << "Unable to decrypt event" << eventId
-                          << "The sender's device has not sent us the keys for "
-                             "this message";
+            // qCWarning(E2EE) << "Unable to decrypt event" << eventId
+            //               << "The sender's device has not sent us the keys for "
+            //                  "this message";
             return QString();
         }
         auto& senderSession = groupSessionIt->second;
@@ -1483,7 +1483,7 @@ RoomEventPtr Room::decryptMessage(const EncryptedEvent& encryptedEvent)
         encryptedEvent.sessionId(), encryptedEvent.id(),
         encryptedEvent.originTimestamp());
     if (decrypted.isEmpty()) {
-        qCWarning(E2EE) << "Encrypted message is empty";
+        // qCWarning(E2EE) << "Encrypted message is empty";
         return {};
     }
     return encryptedEvent.createDecrypted(decrypted);
@@ -2749,7 +2749,6 @@ void Room::Private::addHistoricalMessageEvents(RoomEvents&& events)
 
     for(long unsigned int i = 0; i < events.size(); i++) {
         if(auto* encrypted = eventCast<EncryptedEvent>(events[i])) {
-            qDebug() << "Encrypted Event";
             auto decrypted = q->decryptMessage(*encrypted);
             if(decrypted) {
                 events[i] = std::move(decrypted);
-- 
cgit v1.2.3