Convert verification request and transaction to protocols

element-hq · Jul 18, 2022 · a099590 · a099590
1 parent ff5a63b
commit a099590
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 10 deletions.
diff --git a/Riot/Modules/Application/LegacyAppDelegate.h b/Riot/Modules/Application/LegacyAppDelegate.h
@@ -191,7 +191,7 @@ UINavigationControllerDelegate
  @param session The matrix session.
  @return Indicate NO if the key verification screen could not be presented.
  */
-- (BOOL)presentIncomingKeyVerificationRequest:(MXKeyVerificationRequest*)incomingKeyVerificationRequest
+- (BOOL)presentIncomingKeyVerificationRequest:(id<MXKeyVerificationRequest>)incomingKeyVerificationRequest
  inSession:(MXSession*)session;
 
 - (BOOL)presentUserVerificationForRoomMember:(MXRoomMember*)roomMember session:(MXSession*)mxSession;

diff --git a/Riot/Modules/Application/LegacyAppDelegate.m b/Riot/Modules/Application/LegacyAppDelegate.m
@@ -3636,11 +3636,11 @@ - (void)checkPendingIncomingKeyVerificationsInSession:(MXSession*)mxSession
  return;
  }
 
- [mxSession.crypto.keyVerificationManager transactions:^(NSArray<MXKeyVerificationTransaction *> * _Nonnull transactions) {
+ [mxSession.crypto.keyVerificationManager transactions:^(NSArray<id<MXKeyVerificationTransaction>> * _Nonnull transactions) {
 
  MXLogDebug(@"[AppDelegate][MXKeyVerification] checkPendingIncomingKeyVerificationsInSession: transactions: %@", transactions);
 
- for (MXKeyVerificationTransaction *transaction in transactions)
+ for (id<MXKeyVerificationTransaction> transaction in transactions)
  {
  if (transaction.isIncoming)
  {
@@ -3664,7 +3664,7 @@ - (void)checkPendingIncomingKeyVerifications
  }
 }
 
-- (BOOL)presentIncomingKeyVerificationRequest:(MXKeyVerificationRequest*)incomingKeyVerificationRequest
+- (BOOL)presentIncomingKeyVerificationRequest:(id<MXKeyVerificationRequest>)incomingKeyVerificationRequest
  inSession:(MXSession*)session
 {
  BOOL presented = NO;
@@ -3810,7 +3810,7 @@ - (void)keyVerificationNewRequestNotification:(NSNotification *)notification
 
  NSDictionary *userInfo = notification.userInfo;
 
- MXKeyVerificationRequest *keyVerificationRequest = userInfo[MXKeyVerificationManagerNotificationRequestKey];
+ id<MXKeyVerificationRequest> keyVerificationRequest = userInfo[MXKeyVerificationManagerNotificationRequestKey];
 
  if ([keyVerificationRequest isKindOfClass:MXKeyVerificationByDMRequest.class])
  {
@@ -3893,7 +3893,7 @@ - (void)keyVerificationNewRequestNotification:(NSNotification *)notification
 - (void)presentNewKeyVerificationRequestAlertForSession:(MXSession*)session
  senderName:(NSString*)senderName
  senderId:(NSString*)senderId
- request:(MXKeyVerificationRequest*)keyVerificationRequest
+ request:(id<MXKeyVerificationRequest>)keyVerificationRequest
 {
  if (keyVerificationRequest.state != MXKeyVerificationRequestStatePending)
  {

diff --git a/Riot/Modules/Room/DataSources/RoomDataSource.m b/Riot/Modules/Room/DataSources/RoomDataSource.m
@@ -678,7 +678,7 @@ - (RoomBubbleCellData*)roomBubbleCellDataForEventId:(NSString*)eventId
  return roomBubbleCellData;
 }
 
-- (MXKeyVerificationRequest*)keyVerificationRequestFromEventId:(NSString*)eventId
+- (id<MXKeyVerificationRequest>)keyVerificationRequestFromEventId:(NSString*)eventId
 {
  RoomBubbleCellData *roomBubbleCellData = [self roomBubbleCellDataForEventId:eventId];
 
@@ -745,7 +745,7 @@ - (void)registerKeyVerificationTransactionNotification
  queue:[NSOperationQueue mainQueue]
  usingBlock:^(NSNotification *notification)
  {
- MXKeyVerificationTransaction *keyVerificationTransaction = (MXKeyVerificationTransaction*)notification.object;
+ id<MXKeyVerificationTransaction> keyVerificationTransaction = (id<MXKeyVerificationTransaction>)notification.object;
 
  if ([keyVerificationTransaction.dmRoomId isEqualToString:self.roomId])
  {
@@ -927,7 +927,7 @@ - (void)sendVideo:(NSURL *)videoLocalURL
 
 - (void)acceptVerificationRequestForEventId:(NSString*)eventId success:(void(^)(void))success failure:(void(^)(NSError*))failure
 {
- MXKeyVerificationRequest *keyVerificationRequest = [self keyVerificationRequestFromEventId:eventId];
+ id<MXKeyVerificationRequest> keyVerificationRequest = [self keyVerificationRequestFromEventId:eventId];
 
  if (!keyVerificationRequest)
  {
@@ -950,7 +950,7 @@ - (void)acceptVerificationRequestForEventId:(NSString*)eventId success:(void(^)(
 
 - (void)declineVerificationRequestForEventId:(NSString*)eventId success:(void(^)(void))success failure:(void(^)(NSError*))failure
 {
- MXKeyVerificationRequest *keyVerificationRequest = [self keyVerificationRequestFromEventId:eventId];
+ id<MXKeyVerificationRequest> keyVerificationRequest = [self keyVerificationRequestFromEventId:eventId];
 
  if (!keyVerificationRequest)
  {

diff --git a/changelog.d/pr-6444.misc b/changelog.d/pr-6444.misc
@@ -0,0 +1 @@
+Crypto: Convert verification request and transaction to protocols