Merge remote-tracking branch 'benma/cancel'

Author: benma

src/rust/bitbox02-rust/src/workflow/password.rs

@@ -17,6 +17,14 @@ use bitbox02::input::SafeInputString;
 
 pub use trinary_input_string::{CanCancel, Error};
 
+async fn prompt_cancel() -> Result<(), confirm::UserAbort> {
+    confirm::confirm(&confirm::Params {
+        body: "Do you really\nwant to cancel?",
+        ..Default::default()
+    })
+    .await
+}
+
 /// If `can_cancel` is `Yes`, the workflow can be cancelled.
 /// If it is no, the result is always `Ok(())`.
 ///
@@ -37,7 +45,16 @@ pub async fn enter(
         longtouch: true,
         ..Default::default()
     };
-    trinary_input_string::enter(&params, can_cancel, "").await
+
+    loop {
+        match trinary_input_string::enter(&params, can_cancel, "").await {
+            o @ Ok(_) => return o,
+            Err(Error::Cancelled) => match prompt_cancel().await {
+                Ok(()) => return Err(Error::Cancelled),
+                Err(confirm::UserAbort) => {}
+            },
+        }
+    }
 }
 
 pub enum EnterTwiceError {
@@ -79,12 +96,7 @@ pub async fn enter_twice() -> Result<SafeInputString, EnterTwiceError> {
             .await
             {
                 Ok(()) => break,
-                Err(confirm::UserAbort) => match confirm::confirm(&confirm::Params {
-                    body: "Do you really\nwant to cancel?",
-                    ..Default::default()
-                })
-                .await
-                {
+                Err(confirm::UserAbort) => match prompt_cancel().await {
                     Ok(()) => return Err(EnterTwiceError::Cancelled),
                     Err(confirm::UserAbort) => {}
                 },

src/rust/bitbox02-rust/src/workflow/trinary_input_string.rs

@@ -12,14 +12,16 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-pub use super::cancel::{cancel, set_result, with_cancel, Error};
+pub use super::cancel::{cancel, set_result, Error};
 pub use bitbox02::ui::TrinaryInputStringParams as Params;
 
+use crate::bb02_async::option;
 use bitbox02::input::SafeInputString;
 use core::cell::RefCell;
 
 use alloc::boxed::Box;
 
+#[derive(Copy, Clone)]
 pub enum CanCancel {
     No,
     Yes,
@@ -46,5 +48,8 @@ pub async fn enter(
     if !preset.is_empty() {
         bitbox02::ui::trinary_input_string_set_input(&mut component, preset);
     }
-    with_cancel("", &mut component, &result).await
+    component.screen_stack_push();
+    option(&result)
+        .await
+        .or(Err(super::cancel::Error::Cancelled))
 }