From c1ceb2ff3135130c4d7cd016c30c2ac2e6bfaae8 Mon Sep 17 00:00:00 2001
From: crschnick <crschnick@xpipe.io>
Date: Thu, 1 May 2025 06:21:27 +0000
Subject: [PATCH] Small fixes [stage]

---
 .../java/io/xpipe/app/browser/file/BrowserTransferModel.java | 4 +++-
 .../java/io/xpipe/app/password/PasswordManagerCommand.java   | 4 ++++
 dist/changelogs/16.2_incremental.md                          | 5 +++--
 version                                                      | 2 +-
 4 files changed, 11 insertions(+), 4 deletions(-)

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 a36420032..138f76b16 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
@@ -7,6 +7,7 @@ import io.xpipe.app.util.DesktopHelper;
 import io.xpipe.app.util.ShellTemp;
 import io.xpipe.app.util.ThreadHelper;
 
+import io.xpipe.core.process.OsType;
 import javafx.beans.binding.Bindings;
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.Property;
@@ -105,7 +106,8 @@ public class BrowserTransferModel {
                     return;
                 }
 
-                Path file = TEMP.resolve(name);
+                var fixedFile = entry.getRawFileEntry().getPath().fileSystemCompatible(OsType.getLocal());
+                Path file = TEMP.resolve(fixedFile.getFileName());
                 var item = new Item(model, name, entry, file);
                 items.add(item);
             });
diff --git a/app/src/main/java/io/xpipe/app/password/PasswordManagerCommand.java b/app/src/main/java/io/xpipe/app/password/PasswordManagerCommand.java
index 62b439b30..bf86e4654 100644
--- a/app/src/main/java/io/xpipe/app/password/PasswordManagerCommand.java
+++ b/app/src/main/java/io/xpipe/app/password/PasswordManagerCommand.java
@@ -105,6 +105,10 @@ public class PasswordManagerCommand implements PasswordManager {
 
     @Override
     public String retrievePassword(String key) {
+        if (script == null) {
+            return null;
+        }
+
         var cmd = ExternalApplicationHelper.replaceVariableArgument(script.getValue(), "KEY", key);
         return retrieveWithCommand(cmd);
     }
diff --git a/dist/changelogs/16.2_incremental.md b/dist/changelogs/16.2_incremental.md
index 34d68f1f4..f89b4edfc 100644
--- a/dist/changelogs/16.2_incremental.md
+++ b/dist/changelogs/16.2_incremental.md
@@ -4,10 +4,11 @@ Several docker management platforms like portainer restrict external control of
 
 ## Fixes
 
-- Fix elevation check for Administrator not working in PowerShell environments
-- Fix HyperV VMs not having the port field filled out by default
 - Fix directory rename in file browser not working when pressing enter
 - Fix launched electron applications (e.g. vscode) not using the wayland platform if possible, resulting in worse performance
+- Fix elevation check for Administrator not working in PowerShell environments
+- Fix HyperV VMs not having the port field filled out by default
+- Fix file download causing issues with unsupported characters from another file system in file name
 - Fix RDP client files using wrong temp dir
 - Fix rare StackOverflow when normalizing files
 - Fix service types not updating in display when changed
diff --git a/version b/version
index c69c69688..f65aa172b 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-16.2-2
+16.2-3