From f337a70d2e5aa717b4e73e49353ec0e8c214064f Mon Sep 17 00:00:00 2001 From: crschnick Date: Thu, 8 Oct 2026 04:59:50 +0000 Subject: [PATCH] Fix types for uid/gid comparison --- .../io/xpipe/app/browser/file/BrowserFileListComp.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/io/xpipe/app/browser/file/BrowserFileListComp.java b/app/src/main/java/io/xpipe/app/browser/file/BrowserFileListComp.java index f425898be..d8dfa662c 100644 --- a/app/src/main/java/io/xpipe/app/browser/file/BrowserFileListComp.java +++ b/app/src/main/java/io/xpipe/app/browser/file/BrowserFileListComp.java @@ -241,12 +241,13 @@ public final class BrowserFileListComp extends SimpleRegionBuilder { var group = unix.getGroup() != null ? unix.getGroup() : v != null ? v.getGroupFile().getGroups().getOrDefault(unix.getGid(), "?") : null; - var uid = unix.getUid() != null + // Always use strings so that the ids can be compared below + String uid = unix.getUid() != null ? String.valueOf(unix.getUid()) - : v != null ? v.getPasswdFile().getUidForUserIfPresent(user).orElse(null) : null; - var gid = unix.getGid() != null + : v != null ? v.getPasswdFile().getUidForUserIfPresent(user).map(String::valueOf).orElse(null) : null; + String gid = unix.getGid() != null ? String.valueOf(unix.getGid()) - : v != null ? v.getGroupFile().getGidForGroupIfPresent(group).orElse(null) : null; + : v != null ? v.getGroupFile().getGidForGroupIfPresent(group).map(String::valueOf).orElse(null) : null; var userFormat = user + (uid != null ? " [" + uid + "]" : ""); var groupFormat = group + (gid != null ? " [" + gid + "]" : "");