More things

quotient-im · Dec 30, 2024 · d49e709 · d49e709
1 parent 619bc93
commit d49e709
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 5 deletions.
diff --git a/Quotient/connection.cpp b/Quotient/connection.cpp
@@ -566,6 +566,10 @@ void Connection::sync(int timeout)
         } else {
             auto syncChanges = syncChangesResult->value();
 
+            if (syncChanges->secrets_received()) {
+                emit backupFinished(BackupResult::Success);
+            }
+
             for (const auto& key : syncChanges->keys()) {
                 if (const auto& room = this->room(stringFromRust(key.room_id()))) {
                     room->newSession(stringFromRust(key.session_id()));
@@ -2082,7 +2086,7 @@ void Connection::Private::confirmKeyVerification(KeyVerificationSession* session
 {
     auto requestsResult = (*cryptoMachine)->confirm_verification(stringToRust(session->remoteUser()), stringToRust(session->verificationId()));
     if (requestsResult->has_error()) {
-        qWarning() << stringFromRust(requestsResult->error_string());
+        qWarning() << "Failed to confirm verification" << stringFromRust(requestsResult->error_string());
         return;
     }
     auto requests = requestsResult->value();
@@ -2287,14 +2291,17 @@ void Connection::loadFromBackup(const QString& passphrase)
                 stringToRust(version)
             );
             if (request->is_invalid_passphrase()) {
-                //TODO
+                emit backupFinished(BackupResult::InvalidPassphrase);
+                return;
             }
             if (request->has_error()) {
                 qWarning() << stringFromRust(request->error_string());
+                emit backupFinished(BackupResult::Error);
                 return;
             }
             callApi<UploadCrossSigningSignaturesJob>(fromJson<QHash<UserId, QHash<QString, QJsonObject>>>(jsonFromRust(request->value())));
             (*d->cryptoMachine)->import_from_backup(bytesToRust(keysJob->rawData()));
+            emit backupFinished(BackupResult::Success);
         });
     });
 }
@@ -2343,7 +2350,7 @@ QString Connection::exportKeys(const QString& passphrase)
 
 bool Connection::isUserVerified(const QString& userId) const
 {
-    if (d->cryptoMachine) {
+    if (!d->cryptoMachine) {
         return false;
     }
     auto result = (*d->cryptoMachine)->is_user_verified(stringToRust(userId));

diff --git a/Quotient/connection.h b/Quotient/connection.h
@@ -135,6 +135,13 @@ class QUOTIENT_API Connection : public QObject {
         UnpublishRoom
     }; // FIXME: Should go inside CreateRoomJob
 
+    enum BackupResult {
+        Success,
+        InvalidPassphrase,
+        Error,
+    };
+    Q_ENUM(BackupResult)
+
     explicit Connection(QObject* parent = nullptr);
     explicit Connection(const QUrl& server, QObject* parent = nullptr);
     ~Connection() override;
@@ -341,7 +348,7 @@ class QUOTIENT_API Connection : public QObject {
     bool isVerifiedEvent(const QString& eventId, Room* room);
 
     // //! Returns whether the device is verified
-    // bool isVerifiedDevice(const QString& userId, const QString& deviceId) const;
+    bool isVerifiedDevice(const QString& userId, const QString& deviceId) const;
 
     // //! \brief Returns whether the device is known and supports end-to-end encryption.
     // //!
@@ -936,6 +943,8 @@ public Q_SLOTS:
     //! Usually not relevant to clients.
     void verificationEventProcessed();
 
+    void backupFinished(Connection::BackupResult status);
+
     friend class ::TestCrossSigning;
     friend class KeyVerificationSession;
 protected:

diff --git a/Quotient/crypto-sdk/src/cryptomachine.rs b/Quotient/crypto-sdk/src/cryptomachine.rs
@@ -87,6 +87,7 @@ impl Key {
 pub(crate) struct SyncChanges {
     sessions: Vec<KeyVerificationRequest>,
     keys: Vec<Key>,
+    secrets_received: bool,
 }
 
 pub(crate) enum SyncChangesResult {
@@ -123,6 +124,10 @@ impl SyncChanges {
     pub(crate) fn keys(&self) -> Vec<Key> {
         self.keys.clone()
     }
+
+    pub(crate) fn secrets_received(&self) -> bool {
+        self.secrets_received
+    }
 }
 
 pub(crate) enum VoidResult {
@@ -827,6 +832,7 @@ impl CryptoMachine {
                 .await?;
 
             let mut events = vec![];
+            let mut secrets_received = false;
             for to_device_event in changes.0 {
                 // NOTE: Do not use question mark operator in for loop.
                 match to_device_event.deserialize() {
@@ -842,8 +848,11 @@ impl CryptoMachine {
                                 request.sender, request.content.transaction_id
                             );
                         }
+                    },
+                    Ok(AnyToDeviceEvent::SecretSend(_)) => {
+                        secrets_received = true;
                     }
-                    Ok(_) => {}
+                    Ok(_) => {},
                     Err(error) => {
                         eprintln!("Failed to deserialize to_device event: {}", error);
                     }
@@ -859,6 +868,7 @@ impl CryptoMachine {
                         room_id: it.room_id.to_string(),
                     })
                     .collect(),
+                secrets_received,
             }))
         });
         Box::new(match result {

diff --git a/Quotient/crypto-sdk/src/lib.rs b/Quotient/crypto-sdk/src/lib.rs
@@ -354,6 +354,8 @@ mod ffi {
 
         fn sessions(self: &SyncChanges) -> Vec<KeyVerificationRequest>;
         fn keys(self: &SyncChanges) -> Vec<Key>;
+        fn secrets_received(self: &SyncChanges) -> bool;
+
 
         fn session_id(self: &Key) -> String;
         fn room_id(self: &Key) -> String;