Skip to content
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

Don't relink implicitly when the manager cannot be loaded. #345

Merged
merged 1 commit into from
Jan 3, 2025
Merged

Don't relink implicitly when the manager cannot be loaded. #345

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 9 additions & 4 deletions src/signal/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,15 @@ pub async fn ensure_linked_device(

if !relink {
if let Some(config) = config.clone() {
if let Ok(manager) = presage::Manager::load_registered(store.clone()).await {
// done loading manager from store
return Ok((Box::new(PresageManager::new(manager)), config));
}
match presage::Manager::load_registered(store.clone()).await {
Ok(manager) => {
// done loading manager from store
return Ok((Box::new(PresageManager::new(manager)), config));
}
Err(e) => {
bail!("error loading manager. Try again later or run with --relink to force relink: {}", e)
}
};
}
}

Expand Down
Loading