Merge pull request #1437 from matrix-org/langleyd/4470_notify_verification_acceptance

Notify other devices of verification acceptance

Author: langleyd

MatrixSDK/Crypto/Verification/Data/MXTransactionCancelCode.h

@@ -71,6 +71,9 @@ NS_ASSUME_NONNULL_BEGIN
 // The QR code is invalid
 + (instancetype)qrCodeInvalid;
 
+// Verification request accepted by another device
++ (instancetype)accepted;
+
 @end
 
 NS_ASSUME_NONNULL_END

MatrixSDK/Crypto/Verification/Data/MXTransactionCancelCode.m

@@ -87,4 +87,9 @@ + (instancetype)qrCodeInvalid
     return [[MXTransactionCancelCode alloc] initWithValue:@"m.qr_code.invalid" humanReadable:@"Invalid QR code"];
 }
 
++ (instancetype)accepted
+{
+    return [[MXTransactionCancelCode alloc] initWithValue:@"m.accepted" humanReadable:@"Verification request accepted by another device"];
+}
+
 @end

MatrixSDK/Crypto/Verification/MXKeyVerificationManager.h

@@ -203,6 +203,13 @@ FOUNDATION_EXPORT NSString *const MXKeyVerificationManagerNotificationTransactio
  */
 - (void)removeQRCodeTransactionWithTransactionId:(NSString*)transactionId;
 
+
+- (void)notifyOthersOfAcceptanceWithTransactionId:(NSString*)transactionId
+                               acceptedUserId:(NSString*)acceptedUserId
+                             acceptedDeviceId:(NSString*)acceptedDeviceId
+                                      success:(void(^)(void))success
+                                      failure:(void(^)(NSError *error))failure;
+
 @end
 
 NS_ASSUME_NONNULL_END

MatrixSDK/Crypto/Verification/MXKeyVerificationManager.m

@@ -687,6 +687,25 @@ - (MXHTTPOperation*)sendToOtherInRequest:(MXKeyVerificationRequest*)request
     return operation;
 }
 
+- (void)notifyOthersOfAcceptanceWithTransactionId:(NSString*)transactionId
+                               acceptedUserId:(NSString*)acceptedUserId
+                             acceptedDeviceId:(NSString*)acceptedDeviceId
+                                      success:(void(^)(void))success
+                                      failure:(void(^)(NSError *error))failure
+{
+    [self otherDeviceIdsOfUser:acceptedUserId success:^(NSArray<NSString *> *deviceIds) {
+        NSMutableArray *nonChosenDevices = [deviceIds mutableCopy];
+        [nonChosenDevices removeObject:acceptedDeviceId];
+        
+        MXKeyVerificationCancel *cancel = [MXKeyVerificationCancel new];
+        MXTransactionCancelCode *cancelCode = MXTransactionCancelCode.accepted;
+        cancel.transactionId = transactionId;
+        cancel.code = cancelCode.value;
+        cancel.reason = cancelCode.humanReadable;
+        [self sendToDevices:acceptedUserId deviceIds:nonChosenDevices eventType:kMXEventTypeStringKeyVerificationCancel content:cancel.JSONDictionary success:success failure:failure];
+    } failure:failure];
+}
+
 - (void)cancelVerificationRequest:(MXKeyVerificationRequest*)request
                           success:(void(^)(void))success
                           failure:(void(^)(NSError *error))failure

MatrixSDK/Crypto/Verification/Requests/MXKeyVerificationRequest.m

@@ -197,6 +197,11 @@ - (void)handleReady:(MXKeyVerificationReady*)readyContent
     {
         [self updateState:MXKeyVerificationRequestStateReady notifiy:YES];
     }
+    [self.manager notifyOthersOfAcceptanceWithTransactionId:self.requestId acceptedUserId:self.otherUser acceptedDeviceId: self.otherDevice success:^{
+        MXLogDebug(@"[MXKeyVerificationRequest] handleReady notified others of acceptance");
+    } failure:^(NSError * _Nonnull error) {
+        MXLogError(@"[MXKeyVerificationRequest] handleReady failed notify others of acceptance");
+    }];
 }
 
 - (void)handleCancel:(MXKeyVerificationCancel *)cancelContent