From 474d2017086382bae035441d209bd89ffa341012 Mon Sep 17 00:00:00 2001 From: crschnick Date: Fri, 21 Mar 2025 16:52:45 +0000 Subject: [PATCH] Improve download progress display --- .../xpipe/app/browser/file/BrowserTransferComp.java | 13 +++++++------ .../app/browser/file/BrowserTransferModel.java | 3 ++- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/io/xpipe/app/browser/file/BrowserTransferComp.java b/app/src/main/java/io/xpipe/app/browser/file/BrowserTransferComp.java index 2b4952661..47285890c 100644 --- a/app/src/main/java/io/xpipe/app/browser/file/BrowserTransferComp.java +++ b/app/src/main/java/io/xpipe/app/browser/file/BrowserTransferComp.java @@ -65,13 +65,14 @@ public class BrowserTransferComp extends SimpleComp { return Bindings.createStringBinding( () -> { var p = sourceItem.get().getProgress().getValue(); - var progressSuffix = p == null - || sourceItem - .get() - .downloadFinished() - .get() + var hideProgress = sourceItem + .get() + .downloadFinished() + .get(); + var share = p != null ? (p.getTransferred() * 100 / p.getTotal()) : 0; + var progressSuffix = hideProgress ? "" - : " " + (p.getTransferred() * 100 / p.getTotal()) + "%"; + : " " + share + "%"; return entry.getFileName() + progressSuffix; }, sourceItem.get().getProgress()); diff --git a/app/src/main/java/io/xpipe/app/browser/file/BrowserTransferModel.java b/app/src/main/java/io/xpipe/app/browser/file/BrowserTransferModel.java index 344fb4678..a36420032 100644 --- a/app/src/main/java/io/xpipe/app/browser/file/BrowserTransferModel.java +++ b/app/src/main/java/io/xpipe/app/browser/file/BrowserTransferModel.java @@ -50,8 +50,9 @@ public class BrowserTransferModel { } if (toDownload.isPresent()) { downloadSingle(toDownload.get()); + } else { + ThreadHelper.sleep(20); } - ThreadHelper.sleep(20); } }); thread.start();