MXSession: handleSyncResponse: Decrypt asynchronously to_device events

MXCrypto.handleRoomKeyEvent() has been added to know exactly when we can start decrypting.
matrix-org · May 11, 2021 · 4791c86 · 4791c86
1 parent b3cfb97
commit 4791c86
Show file tree

Hide file tree

Showing 4 changed files with 257 additions and 211 deletions.
diff --git a/MatrixSDK/Crypto/MXCrypto.h b/MatrixSDK/Crypto/MXCrypto.h
@@ -240,6 +240,14 @@ extern NSString *const MXDeviceListDidUpdateUsersDevicesNotification;
  */
 - (void)handleDeviceOneTimeKeysCount:(NSDictionary<NSString *, NSNumber*>*)deviceOneTimeKeysCount;
 
+/**
+ Handle a room key event.
+ 
+ @param event the room key event.
+ @param onComplete the block called when the operation completes.
+ */
+- (void)handleRoomKeyEvent:(MXEvent*)event onComplete:(void (^)(void))onComplete;
+
 /**
  Handle the completion of a /sync.
 

diff --git a/MatrixSDK/Crypto/MXCrypto.m b/MatrixSDK/Crypto/MXCrypto.m
@@ -763,6 +763,18 @@ - (void)handleDeviceListsChanges:(MXDeviceListResponse*)deviceLists
 #endif
 }
 
+- (void)handleRoomKeyEvent:(MXEvent*)event onComplete:(void (^)(void))onComplete
+{
+    // Use decryptionQueue as synchronisation because decryptions require room keys
+    dispatch_async(decryptionQueue, ^{
+        [self onRoomKeyEvent:event];
+
+        dispatch_async(dispatch_get_main_queue(), ^{
+            onComplete();
+        });
+    });
+}
+
 - (void)handleDeviceOneTimeKeysCount:(NSDictionary<NSString *, NSNumber*>*)deviceOneTimeKeysCount
 {
 #ifdef MX_CRYPTO
@@ -2518,7 +2530,6 @@ - (void)onToDeviceEvent:(NSNotification *)notification
         MXWeakify(self);
         switch (event.eventType)
         {
-            case MXEventTypeRoomKey:
             case MXEventTypeRoomForwardedKey:
             {
                 dispatch_async(_cryptoQueue, ^{