Merge pull request #3381 from 21pages/fix

mobile id suffix "\r" or "/r" for relay

flutter/lib/common.dart

@@ -1453,10 +1453,12 @@ connectMainDesktop(String id,
 connect(BuildContext context, String id,
     {bool isFileTransfer = false,
     bool isTcpTunneling = false,
-    bool isRDP = false,
+    bool isRDP = false}) async {
-    bool forceRelay = false}) async {
   if (id == '') return;
   id = id.replaceAll(' ', '');
+  final oldId = id;
+  id = await bind.mainHandleRelayId(id: id);
+  final forceRelay = id != oldId;
   assert(!(isFileTransfer && isTcpTunneling && isRDP),
       "more than one connect type");
 

flutter/lib/desktop/pages/connection_page.dart

@@ -151,10 +151,7 @@ class _ConnectionPageState extends State<ConnectionPage>
   /// Connects to the selected peer.
   void onConnect({bool isFileTransfer = false}) {
     var id = _idController.id;
-    var forceRelay = id.endsWith(r'/r');
+    connect(context, id, isFileTransfer: isFileTransfer);
-    if (forceRelay) id = id.substring(0, id.length - 2);
-    connect(context, id,
-        isFileTransfer: isFileTransfer, forceRelay: forceRelay);
   }
 
   /// UI for the remote ID TextField.

src/flutter_ffi.rs

@@ -840,6 +840,10 @@ pub fn main_get_user_default_option(key: String) -> SyncReturn<String> {
     SyncReturn(get_user_default_option(key))
 }
 
+pub fn main_handle_relay_id(id: String) -> String {
+    handle_relay_id(id)
+}
+
 pub fn session_add_port_forward(
     id: String,
     local_port: i32,

src/ui.rs

@@ -420,8 +420,8 @@ impl UI {
         crate::lan::send_wol(id)
     }
 
-    fn new_remote(&mut self, id: String, remote_type: String) {
+    fn new_remote(&mut self, id: String, remote_type: String, force_relay: bool) {
-        new_remote(id, remote_type)
+        new_remote(id, remote_type, force_relay)
     }
 
     fn is_process_trusted(&mut self, _prompt: bool) -> bool {
@@ -571,6 +571,10 @@ impl UI {
     fn default_video_save_directory(&self) -> String {
         default_video_save_directory()
     }
+
+    fn handle_relay_id(&self, id: String) -> String {
+        handle_relay_id(id)
+    }
 }
 
 impl sciter::EventHandler for UI {
@@ -588,7 +592,7 @@ impl sciter::EventHandler for UI {
         fn set_remote_id(String);
         fn closing(i32, i32, i32, i32);
         fn get_size();
-        fn new_remote(String, bool);
+        fn new_remote(String, String, bool);
         fn send_wol(String);
         fn remove_peer(String);
         fn remove_discovered(String);
@@ -653,6 +657,7 @@ impl sciter::EventHandler for UI {
         fn has_hwcodec();
         fn get_langs();
         fn default_video_save_directory();
+        fn handle_relay_id(String);
     }
 }
 
@@ -718,9 +723,13 @@ pub fn value_crash_workaround(values: &[Value]) -> Arc<Vec<Value>> {
 }
 
 #[inline]
-pub fn new_remote(id: String, remote_type: String) {
+pub fn new_remote(id: String, remote_type: String, force_relay: bool) {
     let mut lock = CHILDREN.lock().unwrap();
-    let args = vec![format!("--{}", remote_type), id.clone()];
+    let mut args = vec![format!("--{}", remote_type), id.clone()];
+    if force_relay {
+        args.push("".to_string()); // password
+        args.push("--relay".to_string());
+    }
     let key = (id.clone(), remote_type.clone());
     if let Some(c) = lock.1.get_mut(&key) {
         if let Ok(Some(_)) = c.try_wait() {

src/ui/index.tis

@@ -62,12 +62,15 @@ function createNewConnect(id, type) {
     id = id.replace(/\s/g, "");
     app.remote_id.value = formatId(id);
     if (!id) return;
+    var old_id = id;
+    id = handler.handle_relay_id(id);
+    var force_relay = old_id != id; 
     if (id == my_id) {
         msgbox("custom-error", "Error", "You cannot connect to your own computer");
         return;
     }
     handler.set_remote_id(id);
-    handler.new_remote(id, type);
+    handler.new_remote(id, type, force_relay);
 }
 
 class ShareRdp: Reactor.Component {

src/ui/remote.rs

@@ -462,6 +462,7 @@ impl sciter::EventHandler for SciterSession {
 
 impl SciterSession {
     pub fn new(cmd: String, id: String, password: String, args: Vec<String>) -> Self {
+        let force_relay = args.contains(&"--relay".to_string());
         let session: Session<SciterHandler> = Session {
             id: id.clone(),
             password: password.clone(),
@@ -486,7 +487,7 @@ impl SciterSession {
             .lc
             .write()
             .unwrap()
-            .initialize(id, conn_type, None, false);
+            .initialize(id, conn_type, None, force_relay);
 
         Self(session)
     }

src/ui_interface.rs

@@ -970,3 +970,12 @@ async fn check_id(
     }
     ""
 }
+
+// if it's relay id, return id processed, otherwise return original id
+pub fn handle_relay_id(id: String) -> String {
+    if id.ends_with(r"\r") || id.ends_with(r"/r") {
+        id[0..id.len() - 2].to_string()
+    } else {
+        id
+    }
+}