[Calendar] close Calendar app instead of 404 with back action

Close: #7229

src/calendar-app/calendarLocator.ts

@@ -105,6 +105,7 @@ import type { HtmlSanitizer } from "../common/misc/HtmlSanitizer.js"
 import { theme } from "../common/gui/theme.js"
 import { CalendarSearchModel } from "./calendar/search/model/CalendarSearchModel.js"
 import { SearchIndexStateInfo } from "../common/api/worker/search/SearchTypes.js"
+import { CALENDAR_PREFIX } from "../common/misc/RouteChange.js"
 
 assertMainOrNode()
 
@@ -577,7 +578,7 @@ class CalendarLocator {
 			const { WebInterWindowEventFacade } = await import("../common/native/main/WebInterWindowEventFacade.js")
 			const { WebAuthnFacadeSendDispatcher } = await import("../common/native/common/generatedipc/WebAuthnFacadeSendDispatcher.js")
 			const { createNativeInterfaces, createDesktopInterfaces } = await import("../common/native/main/NativeInterfaceFactory.js")
-			this.webMobileFacade = new WebMobileFacade(this.connectivityModel, this.mailModel)
+			this.webMobileFacade = new WebMobileFacade(this.connectivityModel, this.mailModel, CALENDAR_PREFIX)
 			this.nativeInterfaces = createNativeInterfaces(
 				this.webMobileFacade,
 				new WebDesktopFacade(this.logins, async () => this.native),

src/common/native/main/WebMobileFacade.ts

@@ -24,7 +24,11 @@ export class WebMobileFacade implements MobileFacade {
 
 	private isAppVisible: stream<boolean> = stream(false)
 
-	constructor(private readonly connectivityModel: WebsocketConnectivityModel, private readonly mailModel: MailModel) {}
+	constructor(
+		private readonly connectivityModel: WebsocketConnectivityModel,
+		private readonly mailModel: MailModel,
+		private readonly baseViewPrefix: string,
+	) {}
 
 	public getIsAppVisible(): stream<boolean> {
 		return this.isAppVisible
@@ -59,14 +63,17 @@ export class WebMobileFacade implements MobileFacade {
 				// current view can navigate back, a region column is focused (not main) and is in singleColumnLayout
 				viewSlider.focusPreviousColumn()
 				return true
-			} else if (
-				currentRoute.startsWith(CONTACTS_PREFIX) ||
-				currentRoute.startsWith(SETTINGS_PREFIX) ||
-				currentRoute.startsWith(SEARCH_PREFIX) ||
-				currentRoute.startsWith(CALENDAR_PREFIX)
-			) {
+			} else if (currentRoute.startsWith(CALENDAR_PREFIX)) {
+				if (this.baseViewPrefix === CALENDAR_PREFIX) {
+					// we are at the main view and want to exit the app
+					return false
+				} else {
+					m.route.set(this.baseViewPrefix)
+					return true
+				}
+			} else if (currentRoute.startsWith(CONTACTS_PREFIX) || currentRoute.startsWith(SETTINGS_PREFIX) || currentRoute.startsWith(SEARCH_PREFIX)) {
 				// go back to mail from other paths
-				m.route.set(MAIL_PREFIX)
+				m.route.set(this.baseViewPrefix)
 				return true
 			} else if (viewSlider && viewSlider.isFirstBackgroundColumnFocused()) {
 				// If the first background column is focused in mail view (showing a folder), move to inbox.

src/mail-app/mailLocator.ts

@@ -115,6 +115,7 @@ import { theme } from "../common/gui/theme.js"
 import { SearchIndexStateInfo } from "../common/api/worker/search/SearchTypes.js"
 import { MobilePaymentsFacade } from "../common/native/common/generatedipc/MobilePaymentsFacade.js"
 import { AppStorePaymentPicker } from "../common/misc/AppStorePaymentPicker.js"
+import { MAIL_PREFIX } from "../common/misc/RouteChange.js"
 
 assertMainOrNode()
 
@@ -693,7 +694,7 @@ class MailLocator {
 			const { createNativeInterfaces, createDesktopInterfaces } = await import("../common/native/main/NativeInterfaceFactory.js")
 			const { parseContacts } = await import("./contacts/ContactImporter.js")
 
-			this.webMobileFacade = new WebMobileFacade(this.connectivityModel, this.mailModel)
+			this.webMobileFacade = new WebMobileFacade(this.connectivityModel, this.mailModel, MAIL_PREFIX)
 			this.nativeInterfaces = createNativeInterfaces(
 				this.webMobileFacade,
 				new WebDesktopFacade(this.logins, async () => this.native),