Key verification: Display "Verify your other sessions" modal at every startup if needed.

2026-04-19 16:13:42 +02:00 · 2020-05-04 19:59:11 +02:00
parent a58abb400c
commit 5c2f0d5ad6
4 changed files with 176 additions and 52 deletions
@@ -27,6 +27,9 @@
 #import "MXRoom+Riot.h"
 #import "MXSession+Riot.h"

+#import "SettingsViewController.h"
+#import "SecurityViewController.h"
+
 #import "Riot-Swift.h"

@interface MasterTabBarController ()
@@ -66,7 +69,7 @@

@property(nonatomic,getter=isHidden) BOOL hidden;

-@property(nonatomic) BOOL verifyCurrentSessionAlertHasBeenDisplayed;
+@property(nonatomic) BOOL reviewSessionAlertHasBeenDisplayed;

@end

@@ -209,7 +212,7 @@
            [childViewControllers removeAllObjects];
        }
        
-        [self presentVerifyCurrentSessionAlertIfNeeded];
+        [self presentReviewSessionsAlertIfNeeded];
    }
    
    if (unifiedSearchViewController)
@@ -219,55 +222,6 @@
    }
 }

- (void)presentVerifyCurrentSessionAlertIfNeeded
-{
-    if (RiotSettings.shared.hideVerifyThisSessionAlert || self.verifyCurrentSessionAlertHasBeenDisplayed)
-    {
-        return;
-    }
-    
-    MXSession *mainSession = self.mxSessions.firstObject;
-    
-    if (self.viewLoaded
-        && mainSession.state >= MXSessionStateStoreDataReady
-        && mainSession.crypto.crossSigning
-        && mainSession.crypto.crossSigning.state == MXCrossSigningStateCrossSigningExists)
-    {
-        self.verifyCurrentSessionAlertHasBeenDisplayed = YES;
-        [self presentVerifyCurrentSessionAlertWithSession:mainSession];
-    }
-}
-
- (void)presentVerifyCurrentSessionAlertWithSession:(MXSession*)session
-{
-    [currentAlert dismissViewControllerAnimated:NO completion:nil];
-    
-    UIAlertController *alert = [UIAlertController alertControllerWithTitle:NSLocalizedStringFromTable(@"key_verification_self_verify_current_session_alert_title", @"Vector", nil)
-                                                                   message:NSLocalizedStringFromTable(@"key_verification_self_verify_current_session_alert_message", @"Vector", nil)
-                                                            preferredStyle:UIAlertControllerStyleAlert];
-    
-    [alert addAction:[UIAlertAction actionWithTitle:NSLocalizedStringFromTable(@"key_verification_self_verify_current_session_alert_validate_action", @"Vector", nil)
-                                              style:UIAlertActionStyleDefault
-                                            handler:^(UIAlertAction * action) {
-                                                [[AppDelegate theDelegate] presentCompleteSecurityForSession:session];
-                                            }]];
-    
-    [alert addAction:[UIAlertAction actionWithTitle:NSLocalizedStringFromTable(@"later", @"Vector", nil)
-                                              style:UIAlertActionStyleCancel
-                                            handler:nil]];
-    
-    [alert addAction:[UIAlertAction actionWithTitle:NSLocalizedStringFromTable(@"do_not_ask_again", @"Vector", nil)
-                                              style:UIAlertActionStyleDestructive
-                                            handler:^(UIAlertAction * action) {
-                                                RiotSettings.shared.hideVerifyThisSessionAlert = YES;
-                                            }]];
-    
-    
-    [self presentViewController:alert animated:YES completion:nil];
-    
-    currentAlert = alert;
-}
-
 - (void)viewDidDisappear:(BOOL)animated
 {
    [super viewDidDisappear:animated];
@@ -444,7 +398,7 @@
 {
    [self refreshTabBarBadges];
    
-    [self presentVerifyCurrentSessionAlertIfNeeded];
+    [self presentReviewSessionsAlertIfNeeded];
 }

 - (void)showAuthenticationScreen
@@ -456,6 +410,8 @@
    {
        isAuthViewControllerPreparing = YES;
        
+        [self resetReviewSessionsFlags];
+        
        [[AppDelegate theDelegate] restoreInitialDisplay:^{
            
            [self performSegueWithIdentifier:@"showAuth" sender:self];
@@ -1034,6 +990,147 @@
    [self presentViewController:currentAlert animated:YES completion:nil];
 }

+#pragma mark - Review session
+
+- (void)presentReviewSessionsAlertIfNeeded
+{
+    MXSession *mainSession = self.mxSessions.firstObject;
+    
+    if (!(self.viewLoaded
+          && mainSession.state >= MXSessionStateStoreDataReady
+          && mainSession.crypto.crossSigning))
+    {
+        return;
+    }
+    
+    switch (mainSession.crypto.crossSigning.state) {
+        case MXCrossSigningStateCrossSigningExists:
+            [self presentVerifyCurrentSessionAlertIfNeededWithSession:mainSession];
+            break;
+        case MXCrossSigningStateCanCrossSign:
+            [self presentReviewUnverifiedSessionsAlertIfNeededWithSession:mainSession];
+            break;
+        default:
+            break;
+    }
+}
+
+- (void)presentVerifyCurrentSessionAlertIfNeededWithSession:(MXSession*)session
+{
+    if (RiotSettings.shared.hideVerifyThisSessionAlert || self.reviewSessionAlertHasBeenDisplayed)
+    {
+        return;
+    }
+    
+    self.reviewSessionAlertHasBeenDisplayed = YES;
+    [self presentVerifyCurrentSessionAlertWithSession:session];
+}
+
+- (void)presentVerifyCurrentSessionAlertWithSession:(MXSession*)session
+{
+    [currentAlert dismissViewControllerAnimated:NO completion:nil];
+    
+    UIAlertController *alert = [UIAlertController alertControllerWithTitle:NSLocalizedStringFromTable(@"key_verification_self_verify_current_session_alert_title", @"Vector", nil)
+                                                                   message:NSLocalizedStringFromTable(@"key_verification_self_verify_current_session_alert_message", @"Vector", nil)
+                                                            preferredStyle:UIAlertControllerStyleAlert];
+    
+    [alert addAction:[UIAlertAction actionWithTitle:NSLocalizedStringFromTable(@"key_verification_self_verify_current_session_alert_validate_action", @"Vector", nil)
+                                              style:UIAlertActionStyleDefault
+                                            handler:^(UIAlertAction * action) {
+                                                [[AppDelegate theDelegate] presentCompleteSecurityForSession:session];
+                                            }]];
+    
+    [alert addAction:[UIAlertAction actionWithTitle:NSLocalizedStringFromTable(@"later", @"Vector", nil)
+                                              style:UIAlertActionStyleCancel
+                                            handler:nil]];
+    
+    [alert addAction:[UIAlertAction actionWithTitle:NSLocalizedStringFromTable(@"do_not_ask_again", @"Vector", nil)
+                                              style:UIAlertActionStyleDestructive
+                                            handler:^(UIAlertAction * action) {
+                                                RiotSettings.shared.hideVerifyThisSessionAlert = YES;
+                                            }]];
+    
+    
+    [self presentViewController:alert animated:YES completion:nil];
+    
+    currentAlert = alert;
+}
+
+- (void)presentReviewUnverifiedSessionsAlertIfNeededWithSession:(MXSession*)session
+{
+    if (RiotSettings.shared.hideReviewSessionsAlert || self.reviewSessionAlertHasBeenDisplayed)
+    {
+        return;
+    }
+    
+    NSArray<MXDeviceInfo*> *devices = [session.crypto.store devicesForUser:session.myUserId].allValues;
+    
+    BOOL isUserHasOneUnverifiedDevice = NO;
+    
+    for (MXDeviceInfo *device in devices)
+    {
+        if (device.trustLevel.localVerificationStatus == MXDeviceUnknown)
+        {
+            isUserHasOneUnverifiedDevice = YES;
+            break;
+        }
+    }
+    
+    if (isUserHasOneUnverifiedDevice)
+    {
+        self.reviewSessionAlertHasBeenDisplayed = YES;
+        [self presentReviewUnverifiedSessionsAlertWithSession:session];
+    }
+}
+
+- (void)presentReviewUnverifiedSessionsAlertWithSession:(MXSession*)session
+{
+    [currentAlert dismissViewControllerAnimated:NO completion:nil];
+    
+    UIAlertController *alert = [UIAlertController alertControllerWithTitle:NSLocalizedStringFromTable(@"key_verification_self_verify_unverified_sessions_alert_title", @"Vector", nil)
+                                                                   message:NSLocalizedStringFromTable(@"key_verification_self_verify_unverified_sessions_alert_message", @"Vector", nil)
+                                                            preferredStyle:UIAlertControllerStyleAlert];
+    
+    [alert addAction:[UIAlertAction actionWithTitle:NSLocalizedStringFromTable(@"key_verification_self_verify_unverified_sessions_alert_validate_action", @"Vector", nil)
+                                              style:UIAlertActionStyleDefault
+                                            handler:^(UIAlertAction * action) {
+                                                [self showSettingsSecurityScreenForSession:session];
+                                            }]];
+    
+    [alert addAction:[UIAlertAction actionWithTitle:NSLocalizedStringFromTable(@"later", @"Vector", nil)
+                                              style:UIAlertActionStyleCancel
+                                            handler:nil]];
+    
+    [alert addAction:[UIAlertAction actionWithTitle:NSLocalizedStringFromTable(@"do_not_ask_again", @"Vector", nil)
+                                              style:UIAlertActionStyleDestructive
+                                            handler:^(UIAlertAction * action) {
+                                                RiotSettings.shared.hideReviewSessionsAlert = YES;
+                                            }]];
+    
+    
+    [self presentViewController:alert animated:YES completion:nil];
+    
+    currentAlert = alert;
+}
+
+- (void)showSettingsSecurityScreenForSession:(MXSession*)session
+{
+    SettingsViewController *settingsViewController = [SettingsViewController instantiate];
+    [settingsViewController loadViewIfNeeded];
+    SecurityViewController *securityViewController = [SecurityViewController instantiateWithMatrixSession:session];
+    
+    [[AppDelegate theDelegate] restoreInitialDisplay:^{
+        self.navigationController.viewControllers = @[settingsViewController, securityViewController];
+    }];
+}
+
+- (void)resetReviewSessionsFlags
+{
+    self.reviewSessionAlertHasBeenDisplayed = NO;
+    RiotSettings.shared.hideVerifyThisSessionAlert = NO;
+    RiotSettings.shared.hideReviewSessionsAlert = NO;
+}
+
 #pragma mark - UITabBarDelegate

 - (void)tabBar:(UITabBar *)tabBar didSelectItem:(UITabBarItem *)item