Skip to content

persist parts of ui shared session information. #1194

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
filipslezaklab merged 2 commits into from
Sep 25, 2026
Merged

persist parts of ui shared session information. #1194

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
56579f6
persist parts of ui shared session information.
filipslezaklab Sep 25, 2026
cd600d4
clean comments
filipslezaklab Sep 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions src-tauri/src/appstate.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,12 @@ impl AppState {
}
}

#[must_use]
pub fn with_session_state(mut self, session_state: SessionState) -> Self {
self.session_state = Mutex::new(session_state);
self
}

pub(crate) fn set_multi_step_mfa_capable(&self, instance_id: Id, capable: bool) {
self.multi_step_mfa_capabilities
.lock()
Expand Down
10 changes: 8 additions & 2 deletions src-tauri/src/gui.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ use crate::{
events::handle_deep_link,
periodic::run_periodic_tasks,
provisioning::handle_client_initialization,
session_state,
session_state::{self, PersistedSessionState},
tray::{configure_tray_icon, setup_tray},
utils::{load_log_targets, DEFAULT_SERVICE_LOG_DIR},
window_manager::*,
Expand Down Expand Up @@ -415,7 +415,13 @@ pub fn run_app() {
let provisioning_config =
async_runtime::block_on(handle_client_initialization(app_handle));

let state = AppState::new(config, provisioning_config);
let mut persisted_session = PersistedSessionState::load(&config_dir);
if async_runtime::block_on(persisted_session.resolve(&DB_POOL)) {
persisted_session.save(&config_dir);
}

let state = AppState::new(config, provisioning_config)
.with_session_state(persisted_session.into());
app.manage(state);

// Pre-build windows hidden so they can be shown/hidden without recreation.
Expand Down
Loading
Loading