mirrors/Authenticator
1
0
Fork 0
mirror of https://gitlab.gnome.org/World/Authenticator.git synced 2025-03-04 08:44:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Ensure that the restore failure toast gets shown

Browse source
This commit is contained in:
Julia Johannesen 2022-06-09 16:54:40 -04:00
parent d0c09af7b6
commit a95caf230d
Failed to generate hash of commit
2 changed files with 33 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
src/widgets/preferences/camera_page.rs
View file

@ -1,4 +1,4 @@
use crate::widgets::Camera;
use crate::{utils::spawn_tokio, widgets::Camera};
use anyhow::Result;
use gtk::{
gio,
@ -11,7 +11,11 @@ use gtk_macros::get_action;
use once_cell::sync::OnceCell;
use std::cell::Cell;
use std::rc::Rc;
use tokio::sync::oneshot;
use tokio::{
select,
sync::oneshot,
time::{sleep, Duration},
};
mod imp {
use super::*;
@ -149,20 +153,33 @@ impl CameraPage {
)));
drop(tx);
drop(src);
imp.camera.scan_from_screenshot().await?;
match rx.await {
Ok(code) => Ok(code),
Err(error) => {
select! {
biased;
result = rx => result.map_err(|error| {
tracing::error!(concat!(
"CameraPage::scan_from_camera failed to receive the resulting QR code from ",
"the sender because the sender was dropped without sending a QR code. This ",
"should never occur."
"CameraPage::scan_from_screenshot failed to receive the resulting QR code ",
"from the sender because the sender was dropped without sending a QR ",
"code. This should never occur.",
));
Err(error.into())
}
error.into()
}),
result = (|| async move {
imp.camera.scan_from_screenshot().await?;
// Give the GLib event loop a whole 2.5 seconds to dispatch the "code-detected"
// action before we assume that its not going to be dispatched at all.
spawn_tokio(async { sleep(Duration::from_millis(2500)).await; }).await;
// Disconnect the signal handler.
imp.camera.disconnect(src.take().unwrap());
anyhow::bail!(concat!(
"CameraPage::scan_from_screenshot failed to receive the resulting QR code in ",
"a reasonable amount of time."
));
})() => result.map_err(From::from),
}
}

4
src/widgets/preferences/window.rs
View file

@ -416,7 +416,9 @@ impl PreferencesWindow {
spawn!(async move {
match camera_page.scan_from_screenshot().await {
Ok(code) => match T::restore_from_data(code.as_bytes(), None) {
Ok(items) => win.restore_items::<T, T::Item>(items),
Ok(items) => {
win.restore_items::<T, T::Item>(items);
},
Err(error) => {
tracing::error!(concat!(
"Encountered an error while trying to restore from a ",