Merge pull request #497 from tchapgouv/phlpro/486-hide-verif

Remove crossSigning activation in 2 other cases
tchapgouv · Apr 6, 2022 · d69a6fe · d69a6fe
2 parents a4e3378 + ba09dcf
commit d69a6fe
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/Riot/Modules/Application/LegacyAppDelegate.m b/Riot/Modules/Application/LegacyAppDelegate.m
@@ -2404,11 +2404,13 @@ - (void)handleAppState
                 case MXSessionStateSyncInProgress:
                     // Stay in launching during the first server sync if the store is empty.
                     isLaunching = (mainSession.rooms.count == 0 && launchAnimationContainerView);
-
+// Tchap: Disable Cross Signing Managment.
+#ifdef SUPPORT_KEYS_BACKUP
                     if (mainSession.crypto.crossSigning && mainSession.crypto.crossSigning.state == MXCrossSigningStateCrossSigningExists)
                     {
                         [mainSession.crypto setOutgoingKeyRequestsEnabled:NO onComplete:nil];
                     }
+#endif
                     break;
                 case MXSessionStateRunning:
                     self.clearingCache = NO;

diff --git a/Riot/Modules/Room/RoomViewController.m b/Riot/Modules/Room/RoomViewController.m
@@ -6100,12 +6100,15 @@ - (void)reRequestKeysAndShowExplanationAlert:(MXEvent*)event
     MXWeakify(self);
     __block UIAlertController *alert;
 
+// Tchap: Disable Cross Signing Managment.
+#ifdef SUPPORT_KEYS_BACKUP
     // Force device verification if session has cross-signing activated and device is not yet verified
     if (self.mainSession.crypto.crossSigning && self.mainSession.crypto.crossSigning.state == MXCrossSigningStateCrossSigningExists)
     {
         [self presentReviewUnverifiedSessionsAlert];
         return;
     }
+#endif
 
     // Make the re-request
     [self.mainSession.crypto reRequestRoomKeyForEvent:event];