Merge branch 'master' into master

src/client/io_loop.rs

@@ -915,13 +915,8 @@ impl<T: InvokeUiSession> Remote<T> {
                             }
                         }
                         Some(file_response::Union::Block(block)) => {
-                            log::info!(
-                                "file response block, file id:{}, file num: {}",
-                                block.id,
-                                block.file_num
-                            );
                             if let Some(job) = fs::get_job(block.id, &mut self.write_jobs) {
-                                if let Err(_err) = job.write(block, None).await {
+                                if let Err(_err) = job.write(block).await {
                                     // to-do: add "skip" for writing job
                                 }
                                 self.update_jobs_status();

src/lang/cn.rs

@@ -389,5 +389,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("or", "或"),
         ("Continue with", "使用"),
         ("Elevate", "提权"),
+        ("Zoom cursor", "缩放鼠标"),
     ].iter().cloned().collect();
 }

src/lang/cs.rs

@@ -389,5 +389,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("or", ""),
         ("Continue with", ""),
         ("Elevate", ""),
+        ("Zoom cursor", ""),
     ].iter().cloned().collect();
 }

src/lang/da.rs

@@ -389,5 +389,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("or", ""),
         ("Continue with", ""),
         ("Elevate", ""),
+        ("Zoom cursor", ""),
     ].iter().cloned().collect();
 }

src/lang/de.rs

@@ -389,5 +389,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("or", ""),
         ("Continue with", ""),
         ("Elevate", ""),
+        ("Zoom cursor", ""),
     ].iter().cloned().collect();
 }

src/lang/eo.rs

@@ -389,5 +389,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("or", ""),
         ("Continue with", ""),
         ("Elevate", ""),
+        ("Zoom cursor", ""),
     ].iter().cloned().collect();
 }

src/lang/es.rs

@@ -389,5 +389,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("or", "o"),
         ("Continue with", "Continuar con"),
         ("Elevate", ""),
+        ("Zoom cursor", ""),
     ].iter().cloned().collect();
 }

src/lang/fa.rs

@@ -388,5 +388,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("This PC", "This PC"),
         ("or", "یا"),
         ("Continue with", "ادامه با"),
+        ("Zoom cursor", ""),
     ].iter().cloned().collect();
 }

src/lang/fr.rs

@@ -389,5 +389,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("or", "ou"),
         ("Continue with", "Continuer avec"),
         ("Elevate", ""),
+        ("Zoom cursor", ""),
     ].iter().cloned().collect();
 }

src/lang/hu.rs

@@ -389,5 +389,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("or", "vagy"),
         ("Continue with", "Folytatás a következővel"),
         ("Elevate", ""),
+        ("Zoom cursor", ""),
     ].iter().cloned().collect();
 }

src/lang/id.rs

@@ -389,5 +389,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("or", ""),
         ("Continue with", ""),
         ("Elevate", ""),
+        ("Zoom cursor", ""),
     ].iter().cloned().collect();
 }

src/lang/it.rs

@@ -389,5 +389,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("or", ""),
         ("Continue with", ""),
         ("Elevate", ""),
+        ("Zoom cursor", ""),
     ].iter().cloned().collect();
 }

src/lang/ja.rs

@@ -389,5 +389,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("or", ""),
         ("Continue with", ""),
         ("Elevate", ""),
+        ("Zoom cursor", ""),
     ].iter().cloned().collect();
 }

src/lang/ko.rs

@@ -389,5 +389,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("or", ""),
         ("Continue with", ""),
         ("Elevate", ""),
+        ("Zoom cursor", ""),
     ].iter().cloned().collect();
 }

src/lang/kz.rs

@@ -389,5 +389,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("or", ""),
         ("Continue with", ""),
         ("Elevate", ""),
+        ("Zoom cursor", ""),
     ].iter().cloned().collect();
 }

src/lang/pl.rs

@@ -389,5 +389,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("or", "albo"),
         ("Continue with", "Kontynuuj z"),
         ("Elevate", ""),
+        ("Zoom cursor", ""),
     ].iter().cloned().collect();
 }

src/lang/pt_PT.rs

@@ -389,5 +389,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("or", ""),
         ("Continue with", ""),
         ("Elevate", ""),
+        ("Zoom cursor", ""),
     ].iter().cloned().collect();
 }

src/lang/ptbr.rs

@@ -389,5 +389,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("or", "ou"),
         ("Continue with", "Continuar com"),
         ("Elevate", ""),
+        ("Zoom cursor", ""),
     ].iter().cloned().collect();
 }

src/lang/ru.rs

@@ -389,5 +389,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("or", "или"),
         ("Continue with", "Продолжить с"),
         ("Elevate", ""),
+        ("Zoom cursor", ""),
     ].iter().cloned().collect();
 }

src/lang/sk.rs

@@ -389,5 +389,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("or", ""),
         ("Continue with", ""),
         ("Elevate", ""),
+        ("Zoom cursor", ""),
     ].iter().cloned().collect();
 }

src/lang/template.rs

@@ -389,5 +389,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("or", ""),
         ("Continue with", ""),
         ("Elevate", ""),
+        ("Zoom cursor", ""),
     ].iter().cloned().collect();
 }

src/lang/tr.rs

@@ -389,5 +389,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("or", "veya"),
         ("Continue with", "bununla devam et"),
         ("Elevate", "Yükseltme"),
+        ("Zoom cursor", ""),
     ].iter().cloned().collect();
 }

src/lang/tw.rs

@@ -389,5 +389,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("or", ""),
         ("Continue with", ""),
         ("Elevate", "提權"),
+        ("Zoom cursor", ""),
     ].iter().cloned().collect();
 }

src/lang/ua.rs

@@ -389,5 +389,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("or", ""),
         ("Continue with", ""),
         ("Elevate", ""),
+        ("Zoom cursor", ""),
     ].iter().cloned().collect();
 }

src/lang/vn.rs

@@ -389,5 +389,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("or", ""),
         ("Continue with", ""),
         ("Elevate", ""),
+        ("Zoom cursor", ""),
     ].iter().cloned().collect();
 }

src/server/connection.rs

@@ -1629,7 +1629,8 @@ async fn start_ipc(
                             file_num,
                             data,
                             compressed}) = data {
-                                stream.send(&Data::FS(ipc::FS::WriteBlock{id, file_num, data, compressed})).await?;
+                                stream.send(&Data::FS(ipc::FS::WriteBlock{id, file_num, data: Bytes::new(), compressed})).await?;
+                                stream.send_raw(data).await?;
                         } else {
                             stream.send(&data).await?;
                         }

src/ui_cm_interface.rs

@@ -1,3 +1,5 @@
+#[cfg(any(target_os = "android", target_os = "ios", feature = "flutter"))]
+use std::iter::FromIterator;
 #[cfg(windows)]
 use std::sync::Arc;
 use std::{
@@ -8,8 +10,6 @@ use std::{
         RwLock,
     },
 };
-#[cfg(any(target_os = "android", target_os = "ios", feature = "flutter"))]
-use std::iter::FromIterator;
 
 #[cfg(windows)]
 use clipboard::{cliprdr::CliprdrClientContext, empty_clipboard, set_conn_enabled, ContextSend};
@@ -343,8 +343,15 @@ impl<T: InvokeUiCM> IpcTaskRunner<T> {
                                 Data::ChatMessage { text } => {
                                     self.cm.new_message(self.conn_id, text);
                                 }
-                                Data::FS(fs) => {
-                                    handle_fs(fs, &mut write_jobs, &self.tx).await;
+                                Data::FS(mut fs) => {
+                                    if let ipc::FS::WriteBlock { id, file_num, data: _, compressed } = fs {
+                                        if let Ok(bytes) = self.stream.next_raw().await {
+                                            fs = ipc::FS::WriteBlock{id, file_num, data:bytes.into(), compressed};
+                                            handle_fs(fs, &mut write_jobs, &self.tx).await;
+                                        }
+                                    } else {
+                                        handle_fs(fs, &mut write_jobs, &self.tx).await;
+                                    }
                                 }
                                 #[cfg(windows)]
                                 Data::ClipbaordFile(_clip) => {
@@ -597,16 +604,13 @@ async fn handle_fs(fs: ipc::FS, write_jobs: &mut Vec<fs::TransferJob>, tx: &Unbo
         } => {
             if let Some(job) = fs::get_job(id, write_jobs) {
                 if let Err(err) = job
-                    .write(
-                        FileTransferBlock {
-                            id,
-                            file_num,
-                            data,
-                            compressed,
-                            ..Default::default()
-                        },
-                        None,
-                    )
+                    .write(FileTransferBlock {
+                        id,
+                        file_num,
+                        data,
+                        compressed,
+                        ..Default::default()
+                    })
                     .await
                 {
                     send_raw(fs::new_error(id, err, file_num), &tx);