Merge branch 'fix-linux-launch'

Author: andrewbenington

src-tauri/src/startup.rs

@@ -1,5 +1,4 @@
 use std::path::{Path, PathBuf};
-
 use tauri::{App, Manager};
 
 use crate::{
@@ -9,24 +8,21 @@ use crate::{
     versioning::{self, UpdateFeatures},
 };
 
+#[cfg(target_os = "linux")]
+use dialog::DialogBox;
+#[cfg(not(target_os = "linux"))]
+use tauri_plugin_dialog::{DialogExt, MessageDialogButtons, MessageDialogKind};
+
 pub fn run_app_startup(app: &App) -> Result<Vec<UpdateFeatures>> {
     let handle = app.handle();
 
     let update_features: Vec<UpdateFeatures> =
         match versioning::handle_updates_get_features(handle, false) {
             Err(error) => match error {
                 Error::OutdatedVersion { .. } => {
-                    let should_quit = util::show_prompt_dialog(
-                        app,
-                        format!(
-                            "{error}\nWould you like to quit and avoid potential storage issues?"
-                        ),
-                        "OpenHome Version Error",
-                        "Quit",
-                        "Launch App Anyways",
-                    );
-
-                    if should_quit {
+                    let should_launch = show_version_error_prompt(app, &error);
+
+                    if should_launch {
                         return Err(error);
                     }
 
@@ -115,3 +111,26 @@ fn set_theme_from_settings(app: &App) -> Result<()> {
         .set_theme(theme_option)
         .map_err(|e| Error::other_with_source("Could not set theme", e))
 }
+
+pub fn show_version_error_prompt(_app: &tauri::App, error: &Error) -> bool {
+    #[cfg(not(target_os = "linux"))]
+    return !_app
+        .dialog()
+        .message(error.to_string())
+        .title("OpenHome Version Error")
+        .kind(MessageDialogKind::Error)
+        .buttons(MessageDialogButtons::OkCancelCustom(
+            "Quit".to_owned(),
+            "Launch App Anyways".to_owned(),
+        ))
+        .blocking_show();
+
+    #[cfg(target_os = "linux")]
+    dialog::Question::new(format!(
+        "{error}\nDo you want to accept the risk and launch anyways?"
+    ))
+    .title("OpenHome Version Error")
+    .show()
+    .expect("Could not display dialog box")
+    .eq(&dialog::Choice::Yes)
+}

src-tauri/src/util.rs

@@ -14,7 +14,7 @@ use crate::error::{Error, Result};
 #[cfg(target_os = "linux")]
 use dialog::DialogBox;
 #[cfg(not(target_os = "linux"))]
-use tauri_plugin_dialog::{DialogExt, MessageDialogButtons, MessageDialogKind};
+use tauri_plugin_dialog::{DialogExt, MessageDialogKind};
 
 #[derive(serde::Serialize, serde::Deserialize, Debug)]
 pub struct ImageResponse {
@@ -320,30 +320,3 @@ pub fn show_error_dialog(_app: &tauri::App, message: impl Into<String>, title: i
         .show()
         .expect("Could not display dialog box");
 }
-
-pub fn show_prompt_dialog(
-    _app: &tauri::App,
-    message: impl Into<String>,
-    title: impl Into<String>,
-    _yes: impl Into<String>,
-    _no: impl Into<String>,
-) -> bool {
-    #[cfg(not(target_os = "linux"))]
-    return _app
-        .dialog()
-        .message(message)
-        .title(title)
-        .kind(MessageDialogKind::Error)
-        .buttons(MessageDialogButtons::OkCancelCustom(
-            _yes.into(),
-            _no.into(),
-        ))
-        .blocking_show();
-
-    #[cfg(target_os = "linux")]
-    dialog::Question::new(message)
-        .title(title)
-        .show()
-        .expect("Could not display dialog box")
-        .eq(&dialog::Choice::Yes)
-}