Work

Author: TobiasFella

CMakeLists.txt

@@ -90,7 +90,7 @@ set(${PROJECT_NAME}_INSTALL_INCLUDEDIR
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 
-find_package(${Qt} ${QtMinVersion} REQUIRED Core Network Gui Test Sql)
+find_package(${Qt} ${QtMinVersion} REQUIRED Core Network Gui Test Sql CorePrivate)
 get_filename_component(Qt_Prefix "${${Qt}_DIR}/../../../.." ABSOLUTE)
 
 find_package(${Qt}Keychain REQUIRED)

Quotient/connection.cpp

@@ -47,6 +47,8 @@
 #include <QtCore/QRegularExpression>
 #include <QtCore/QStandardPaths>
 #include <QtCore/QStringBuilder>
+#include <QtSql/QSqlDatabase>
+#include <QtSql/QSqlQuery>
 #include <QtNetwork/QDnsLookup>
 #include <qt6keychain/keychain.h>
 
@@ -369,14 +371,48 @@ void Connection::Private::setupCryptoMachine(const QByteArray& picklingKey)
     mxIdForDb.replace(u':', u'_');
     const QString databasePath{QStandardPaths::writableLocation(QStandardPaths::AppDataLocation)
                                % u'/' % mxIdForDb % u'/' % q->deviceId()};
+
+    QString accountPickle;
+    bool hasDb = QFileInfo(QStandardPaths::writableLocation(QStandardPaths::AppDataLocation) + u'/' + mxIdForDb + "/quotient_%1.db3"_L1.arg(q->deviceId())).exists();
+    if (hasDb) {
+        auto db = QSqlDatabase::addDatabase(u"QSQLITE"_s, "Quotient_"_L1 + q->deviceId());
+        const QString databasePath{ QStandardPaths::writableLocation(QStandardPaths::AppDataLocation) % u'/' % mxIdForDb };
+        QDir(databasePath).mkpath("."_L1);
+        db.setDatabaseName(databasePath + "/quotient_%1.db3"_L1.arg(q->deviceId()));
+        db.open();
+        QSqlQuery query(db);
+        query.prepare(u"SELECT pickle FROM accounts;"_s);
+        query.exec();
+        query.next();
+        accountPickle = query.value(0).toString();
+
+        db.close();
+    }
+
     cryptoMachine = crypto::init(stringToRust(q->userId()), stringToRust(q->deviceId()),
-                                 stringToRust(databasePath), bytesToRust(picklingKey));
+                                 stringToRust(databasePath), bytesToRust(picklingKey.toBase64()), stringToRust(accountPickle));
     if (!(*cryptoMachine)->is_ok()) {
         qCritical() << "Failed to load crypto machine"
                     << static_cast<int>((*cryptoMachine)->error())
                     << stringFromRust((*cryptoMachine)->error_string());
         qApp->exit(1);
     }
+
+    if (hasDb) {
+        auto db = QSqlDatabase::addDatabase(u"QSQLITE"_s, "Quotient_"_L1 + q->deviceId());
+        const QString databasePath{ QStandardPaths::writableLocation(QStandardPaths::AppDataLocation) % u'/' % mxIdForDb };
+        QDir(databasePath).mkpath("."_L1);
+        db.setDatabaseName(databasePath + "/quotient_%1.db3"_L1.arg(q->deviceId()));
+        db.open();
+
+        QSqlQuery query(db);
+        query.prepare(u"SELECT * FROM inbound_megolm_sessions;"_s);
+        query.exec();
+        while(query.next()) {
+            (*cryptoMachine)->inbound_from_libolm_pickle(stringToRust(query.value("pickle").toString()), bytesToRust(picklingKey.toBase64()), stringToRust(query.value("roomId").toString()), stringToRust(query.value("senderKey").toString()), stringToRust(query.value("senderClaimedEd25519Key").toString()));
+        }
+        // QFile(QStandardPaths::writableLocation(QStandardPaths::AppDataLocation) + u'/' + mxIdForDb + "/quotient_%1.db3"_L1.arg(q->deviceId())).remove();
+    }
 }
 
 void Connection::Private::completeSetup(const QString& mxId, bool newLogin,
@@ -730,17 +766,6 @@ void Connection::Private::processOutgoingRequests()
                 }));
                 break;
             }
-            case 6: { // keys backup
-                futures.append(QFuture<void>(
-                    q->callApi<PutRoomKeysJob>(stringFromRust(request.keys_backup_version()),
-                                               fromRustJson<QHash<RoomId, RoomKeyBackup>>(
-                                                   request.keys_backup_rooms()))
-                        .onResult([this, id](const auto& job) {
-                    (*cryptoMachine)
-                        ->mark_keys_backup_as_sent(bytesToRust(job->rawData()), stringToRust(id));
-                })));
-                break;
-            }
         }
     }