more wip

Author: richvdh

src/components/structures/MatrixChat.tsx

@@ -1380,23 +1380,24 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
      *
      * TODO: fix docs
      */
-    private async showNextPostLoginView(): Promise<void> {
+    private async showNextView(): Promise<void> {
         const cli = MatrixClientPeg.safeGet();
 
+        const forceVerification = SdkConfig.get("force_verification");
+        logger.debug(`showNextView: current view=${this.state.view}; force_verification=${forceVerification}`);
+
         // First of all, figure out if we need to do some cross-signing setup.
         // Traditionally, we would only do that just after logging in, but with the advent of `force_verification`,
         // we may need to do it on every restart.
         if (
-            (this.state.view == Views.LOGIN ||
-                this.state.view == Views.REGISTER ||
-                SdkConfig.get("force_verification")) &&
+            (this.state.view == Views.LOGIN || this.state.view == Views.REGISTER || forceVerification) &&
             !(await shouldSkipSetupEncryption(cli))
         ) {
             const crypto = cli.getCrypto()!;
 
             // Check if we need to create cross-signing keys for this user.
             if (!(await crypto!.userHasCrossSigningKeys())) {
-                logger.info("showNextPostLoginScreen: user lacks cross-signing keys, starting setup");
+                logger.info("showNextView: user lacks cross-signing keys, starting setup");
                 InitialCryptoSetupStore.sharedInstance().startInitialCryptoSetup(
                     cli,
                     this.onCompleteSecurityE2eSetupFinished,
@@ -1410,21 +1411,21 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
                 ModuleRunner.instance.extensions.cryptoSetup.SHOW_ENCRYPTION_SETUP_UI &&
                 (await this.deviceNeedsVerification())
             ) {
-                logger.info("showNextPostLoginScreen: user must verify device, starting verification");
+                logger.info("showNextView: user must verify device, starting verification");
                 this.setStateForNewView({ view: Views.COMPLETE_SECURITY });
                 return;
             }
         }
 
         // We've done the E2E setup stuff, so we can transition to the regular application, with
         // an appropriate screen.
-        logger.info("showNextPostLoginScreen: E2E setup done, transitioning to logged in view.");
+        logger.info("showNextView: E2E setup done, transitioning to logged in view.");
 
         this.setStateForNewView({ view: Views.LOGGED_IN });
         // If a specific screen is set to be shown after login, show that above
         // all else, as it probably means the user clicked on something already.
         if (this.screenAfterLogin?.screen) {
-            logger.info(`showNextPostLoginView: showing screen ${this.screenAfterLogin.screen}`);
+            logger.info(`showNextView: showing screen ${this.screenAfterLogin.screen}`);
             this.showScreen(this.screenAfterLogin.screen, this.screenAfterLogin.params);
             this.screenAfterLogin = undefined;
         } else if (MatrixClientPeg.currentUserIsJustRegistered()) {
@@ -1433,7 +1434,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
             if (ThreepidInviteStore.instance.pickBestInvite()) {
                 // The user has a 3pid invite pending - show them that
                 const threepidInvite = ThreepidInviteStore.instance.pickBestInvite();
-                logger.info(`showNextPostLoginView: showing room ${threepidInvite.roomId} after registration`);
+                logger.info(`showNextView: showing room ${threepidInvite.roomId} after registration`);
 
                 // HACK: This is a pretty brutal way of threading the invite back through
                 // our systems, but it's the safest we have for now.
@@ -1442,11 +1443,11 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
             } else {
                 // The user has just logged in after registering,
                 // so show the homepage.
-                logger.info("showNextPostLoginView: Showing home page after registration");
+                logger.info("showNextView: Showing home page after registration");
                 dis.dispatch<ViewHomePagePayload>({ action: Action.ViewHomePage, justRegistered: true });
             }
         } else {
-            logger.info("showNextPostLoginView: showScreenAfterLogin");
+            logger.info("showNextView: showScreenAfterLogin");
             this.showScreenAfterLogin();
         }
 
@@ -1779,7 +1780,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
             ready: true,
         });
 
-        await this.showNextPostLoginView();
+        await this.showNextView();
     }
 
     public showScreen(screen: string, params?: { [key: string]: any }): void {
@@ -2083,11 +2084,11 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
     };
 
     /** Called when {@link Views.E2E_SETUP} or {@link Views.COMPLETE_SECURITY} have completed. */
-    private onCompleteSecurityE2eSetupFinished(): void {
-        this.showNextPostLoginView().catch((e) => {
+    private onCompleteSecurityE2eSetupFinished = (): void => {
+        this.showNextView().catch((e) => {
             logErrorAndShowErrorDialog("Exception showing post-login screen", e);
         });
-    }
+    };
 
     private getFragmentAfterLogin(): string {
         let fragmentAfterLogin = "";