wip

BitBoxSwiss · Jul 1, 2024 · 447411d · 447411d
1 parent 4784c90
commit 447411d
Show file tree

Hide file tree

Showing 3 changed files with 105 additions and 40 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/bitbox-bridge/Cargo.toml b/bitbox-bridge/Cargo.toml
@@ -19,7 +19,7 @@ windows-service = "0.7.0"
 clap = { version = "4.5", features = ["cargo"] }
 warp = "0.3.7"
 tera = "1.20"
-rfd = "0.14"
+rfd = { git = "https://github.com/benma/rfd.git", rev = "2568d48" }
 
 [dependencies.u2fframing]
 version = "0.1"

diff --git a/bitbox-bridge/src/web.rs b/bitbox-bridge/src/web.rs
@@ -102,12 +102,14 @@ impl AllowedOrigins {
                 return true;
             }
         }
-        let answer = rfd::AsyncMessageDialog::new()
+        // The AsyncMessageDialog does not work in rfd on macOS yet witout a main window.
+        // https://github.com/PolyMeilex/rfd/issues/104
+        // So we use the regular blocking MessageDialog.
+        let answer = rfd::MessageDialog::new()
             .set_title("BitBoxBridge")
             .set_description("Do you want to proceed?")
             .set_buttons(rfd::MessageButtons::YesNo)
-            .show()
-            .await;
+            .show();
         let ok = answer == rfd::MessageDialogResult::Yes;
         if ok {
             self.0.lock().unwrap().insert(origin.into());