desktop: Use open URL mode from preferences in DesktopNavigatorInterface

Author: kjarosh

desktop/src/backends/navigator.rs

@@ -1,5 +1,4 @@
 use rfd::{MessageButtons, MessageDialog, MessageDialogResult, MessageLevel};
-use ruffle_core::backend::navigator::OpenURLMode;
 use ruffle_frontend_utils::backends::navigator::NavigatorInterface;
 use std::fs::File;
 use std::io;
@@ -10,7 +9,7 @@ use tokio::sync::oneshot;
 use url::Url;
 use winit::event_loop::EventLoopProxy;
 
-use crate::cli::FilesystemAccessMode;
+use crate::cli::{FilesystemAccessMode, OpenUrlMode};
 use crate::custom_event::RuffleEvent;
 use crate::gui::dialogs::filesystem_access_dialog::{
     FilesystemAccessDialogConfiguration, FilesystemAccessDialogResult,
@@ -19,6 +18,7 @@ use crate::gui::dialogs::network_access_dialog::{
     NetworkAccessDialogConfiguration, NetworkAccessDialogResult,
 };
 use crate::gui::DialogDescriptor;
+use crate::preferences::GlobalPreferences;
 use crate::util::open_url;
 
 // TODO Make this more generic, maybe a manager?
@@ -75,28 +75,28 @@ impl PathAllowList {
 
 #[derive(Clone)]
 pub struct DesktopNavigatorInterface {
+    preferences: GlobalPreferences,
+
     // Arc + Mutex due to macOS
     event_loop: Arc<Mutex<EventLoopProxy<RuffleEvent>>>,
 
     filesystem_access_mode: FilesystemAccessMode,
 
-    open_url_mode: OpenURLMode,
-
     allow_list: PathAllowList,
 }
 
 impl DesktopNavigatorInterface {
     pub fn new(
+        preferences: GlobalPreferences,
         event_loop: EventLoopProxy<RuffleEvent>,
         movie_path: Option<PathBuf>,
         filesystem_access_mode: FilesystemAccessMode,
-        open_url_mode: OpenURLMode,
     ) -> Self {
         Self {
+            preferences,
             event_loop: Arc::new(Mutex::new(event_loop)),
             allow_list: PathAllowList::new(movie_path),
             filesystem_access_mode,
-            open_url_mode,
         }
     }
 
@@ -120,12 +120,13 @@ impl DesktopNavigatorInterface {
 
 impl NavigatorInterface for DesktopNavigatorInterface {
     fn navigate_to_website(&self, url: Url) {
-        if self.open_url_mode == OpenURLMode::Deny {
+        let open_url_mode = self.preferences.open_url_mode();
+        if open_url_mode == OpenUrlMode::Deny {
             tracing::warn!("SWF tried to open a website, but opening a website is not allowed");
             return;
         }
 
-        if self.open_url_mode == OpenURLMode::Allow {
+        if open_url_mode == OpenUrlMode::Allow {
             open_url(&url);
             return;
         }

desktop/src/player.rs

@@ -231,10 +231,10 @@ impl ActivePlayer {
             opt.tcp_connections.unwrap_or(SocketMode::Ask),
             Rc::new(content),
             DesktopNavigatorInterface::new(
+                preferences.clone(),
                 event_loop.clone(),
                 movie_url.to_file_path().ok(),
                 opt.filesystem_access_mode,
-                opt.open_url_mode,
             ),
         );