Merge remote-tracking branch 'origin/create-shortcut-to-open-uplink-w…

…hen-it-is-minimize' into create-shortcut-to-open-uplink-when-it-is-minimize
Satellite-im · Jan 22, 2024 · 0348a95 · 0348a95
2 parents 0776934 + d052378
commit 0348a95
Show file tree

Hide file tree

Showing 14 changed files with 516 additions and 301 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/common/src/upload_file_channel.rs b/common/src/upload_file_channel.rs
@@ -11,7 +11,7 @@ pub enum UploadFileAction<T> {
     Cancelling,
     UploadFiles(Vec<PathBuf>),
     Uploading((String, String, String)),
-    Finishing,
+    Finishing(PathBuf, bool),
     Finished(T),
     Error,
 }