Skip to content

Commit

Permalink
fix: Ensure we have a folder at init
Browse files Browse the repository at this point in the history
  • Loading branch information
PhilippeWeidmann committed Sep 25, 2023
1 parent f99a026 commit ae12386
Showing 1 changed file with 12 additions and 2 deletions.
14 changes: 12 additions & 2 deletions Mail/Views/SplitView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -55,13 +55,19 @@ struct SplitView: View {
@Weak private var splitViewController: UISplitViewController?

@StateObject private var navigationDrawerController = NavigationDrawerState()
@StateObject private var splitViewManager = SplitViewManager()
@StateObject private var splitViewManager: SplitViewManager

@LazyInjectService private var orientationManager: OrientationManageable
@LazyInjectService private var snackbarPresenter: SnackBarPresentable
@LazyInjectService private var platformDetector: PlatformDetectable

let mailboxManager: MailboxManager
init(mailboxManager: MailboxManager) {
self.mailboxManager = mailboxManager
let splitViewManager = SplitViewManager()
splitViewManager.selectedFolder = mailboxManager.getFolder(with: .inbox)
_splitViewManager = StateObject(wrappedValue: splitViewManager)
}

var body: some View {
Group {
Expand Down Expand Up @@ -152,7 +158,11 @@ struct SplitView: View {
}
.task(id: mailboxManager.mailbox.objectId) {
await fetchFolders()
splitViewManager.selectedFolder = getInbox()

let newInbox = getInbox()
if newInbox?.id != splitViewManager.selectedFolder?.id {
splitViewManager.selectedFolder = newInbox
}
}
.onRotate { orientation in
guard let interfaceOrientation = orientation else { return }
Expand Down

0 comments on commit ae12386

Please sign in to comment.