fix(page): use cached mailboxes for the initial bootstrap

lib/Contracts/IMailManager.php

@@ -44,6 +44,19 @@ public function getMailbox(string $uid, int $id): Mailbox;
 	 */
 	public function getMailboxes(Account $account, bool $forceSync = false): array;
 
+	/**
+	 * Like getMailboxes(), but reads only the locally cached mailbox list --
+	 * no live IMAP sync. Useful for callers that need to list an account's
+	 * mailboxes quickly and don't need (or can't afford to wait for) an
+	 * up-to-date view, e.g. a page bootstrap iterating over every connected
+	 * account.
+	 *
+	 * @param Account $account
+	 *
+	 * @return Mailbox[]
+	 */
+	public function getCachedMailboxes(Account $account): array;
+
 	/**
 	 * @param Account $account
 	 * @param string $name

lib/Controller/PageController.php

@@ -139,6 +139,13 @@ public function index(): TemplateResponse {
 			$this->appManager->getAppVersion('mail'),
 		);
 
+		// Uses getCachedMailboxes() (DB read only) rather than getMailboxes()
+		// (which does a live IMAP sync first): this loop is synchronous
+		// across every connected account, so one account with a slow or
+		// unreachable IMAP server used to delay/block the whole page load
+		// for every other account too. The existing try/catch below only
+		// ever helped if the call threw quickly -- it did nothing for a
+		// hang, since a hang never reaches the catch block at all.
 		$mailAccounts = $this->accountService->findByUserId($this->userId);
 		$accountsJson = [];
 		foreach ($mailAccounts as $mailAccount) {
@@ -147,7 +154,7 @@ public function index(): TemplateResponse {
 			$json['aliases'] = $this->aliasesService->findAll($mailAccount->getId(),
 				$this->userId);
 			try {
-				$mailboxes = $this->mailManager->getMailboxes($mailAccount);
+				$mailboxes = $this->mailManager->getCachedMailboxes($mailAccount);
 				$json['mailboxes'] = $mailboxes;
 			} catch (Throwable $ex) {
 				$this->logger->critical('Could not load account mailboxes: ' . $ex->getMessage(), [
@@ -166,7 +173,7 @@ public function index(): TemplateResponse {
 			$json['aliases'] = $this->aliasesService->findAll($delegatedAccount->getId(),
 				$delegatedAccount->getUserId());
 			try {
-				$mailboxes = $this->mailManager->getMailboxes($delegatedAccount);
+				$mailboxes = $this->mailManager->getCachedMailboxes($delegatedAccount);
 				$json['mailboxes'] = $mailboxes;
 			} catch (Throwable $ex) {
 				$this->logger->critical('Could not load delegated account mailboxes: ' . $ex->getMessage(), [

lib/Service/MailManager.php

@@ -101,6 +101,11 @@ public function getMailboxes(Account $account, bool $forceSync = false): array {
 		return $this->mailboxMapper->findAll($account);
 	}
 
+	#[\Override]
+	public function getCachedMailboxes(Account $account): array {
+		return $this->mailboxMapper->findAll($account);
+	}
+
 	#[\Override]
 	public function createMailbox(Account $account, string $name, array $specialUse = []): Mailbox {
 		$client = $this->imapClientFactory->getClient($account);

tests/Unit/Controller/PageControllerTest.php

@@ -210,7 +210,7 @@ public function testIndex(): void {
 			->with($this->userId)
 			->willReturn([]);
 		$this->mailManager->expects($this->exactly(2))
-			->method('getMailboxes')
+			->method('getCachedMailboxes')
 			->withConsecutive(
 				[$account1],
 				[$account2]

tests/Unit/Service/MailManagerTest.php

@@ -126,6 +126,25 @@ public function testGetFolders() {
 		$this->assertSame($mailboxes, $result);
 	}
 
+	public function testGetCachedMailboxesDoesNotSync() {
+		/** @var Account|MockObject $account */
+		$account = $this->createStub(Account::class);
+		$mailboxes = [
+			$this->createMock(Mailbox::class),
+			$this->createMock(Mailbox::class),
+		];
+		$this->mailboxSync->expects($this->never())
+			->method('sync');
+		$this->mailboxMapper->expects($this->once())
+			->method('findAll')
+			->with($this->equalTo($account))
+			->willReturn($mailboxes);
+
+		$result = $this->manager->getCachedMailboxes($account);
+
+		$this->assertSame($mailboxes, $result);
+	}
+
 	public function testCreateFolder() {
 		$client = $this->createStub(Horde_Imap_Client_Socket::class);
 		$account = $this->createStub(Account::class);