diff --git a/android/app/src/main/java/eu/lixko/ts3j/client/android/ServerController.kt b/android/app/src/main/java/eu/lixko/ts3j/client/android/ServerController.kt index 459129d..5dd34f4 100644 --- a/android/app/src/main/java/eu/lixko/ts3j/client/android/ServerController.kt +++ b/android/app/src/main/java/eu/lixko/ts3j/client/android/ServerController.kt @@ -270,6 +270,7 @@ class ServerController internal constructor( val canKickFromServer: Boolean get() = session.canKickFromServer() val canBanClients: Boolean get() = session.canBanClients() val canViewBanList: Boolean get() = session.canViewBanList() + val canBrowseFiles: Boolean get() = session.canBrowseFiles() val canCreateBans: Boolean get() = session.isConnected && conn.model.permits("b_client_ban_create") /** The longest ban we may hand out in seconds; 0 or -1 for no limit. */ diff --git a/android/app/src/main/java/eu/lixko/ts3j/client/android/ui/ServerScreen.kt b/android/app/src/main/java/eu/lixko/ts3j/client/android/ui/ServerScreen.kt index 5db2782..6004632 100644 --- a/android/app/src/main/java/eu/lixko/ts3j/client/android/ui/ServerScreen.kt +++ b/android/app/src/main/java/eu/lixko/ts3j/client/android/ui/ServerScreen.kt @@ -434,10 +434,10 @@ fun ServerScreen( channelSheet = null server.channelRef(id)?.let { ref -> toWhisperList = channel.name to { it.channels.add(ref) } } }, - onFiles = { + onFiles = if (server.canBrowseFiles) ({ channelSheet = null if (channel.locked) filesLocked = id else files = FilesOf(id, channel.name, "") - }, + }) else null, onCreateSub = if (server.canCreateChannels) ({ channelSheet = null; channelEdit = ChannelEdit(0, id) }) else null, onEdit = if (server.canEditChannels) ({ channelSheet = null; channelEdit = ChannelEdit(id) }) else null, onDelete = if (server.canDeleteChannels) ({ channelSheet = null; deletingChannel = id }) else null, diff --git a/android/app/src/main/java/eu/lixko/ts3j/client/android/ui/Sheets.kt b/android/app/src/main/java/eu/lixko/ts3j/client/android/ui/Sheets.kt index 9e9e98f..d27141c 100644 --- a/android/app/src/main/java/eu/lixko/ts3j/client/android/ui/Sheets.kt +++ b/android/app/src/main/java/eu/lixko/ts3j/client/android/ui/Sheets.kt @@ -147,8 +147,8 @@ fun ChannelSheet( onBookmark: () -> Unit, onWhisper: () -> Unit, onAddToWhisperList: () -> Unit, - onFiles: () -> Unit, /** Each null when we may not. */ + onFiles: (() -> Unit)?, onCreateSub: (() -> Unit)?, onEdit: (() -> Unit)?, onDelete: (() -> Unit)?, @@ -168,7 +168,7 @@ fun ChannelSheet( } Action("WHISPER", "Whisper", onClick = onWhisper) Action("ON_WHISPERLIST", "Add to whisper list…", onClick = onAddToWhisperList) - Action("FILETRANSFER", "Browse files", onClick = onFiles) + onFiles?.let { Action("FILETRANSFER", "Browse files", onClick = it) } Action("BOOKMARK_ADD", "Add to bookmarks", onClick = onBookmark) onCreateSub?.let { Action("CHANNEL_CREATE_SUB", "Create sub-channel", onClick = it) } onEdit?.let { Action("CHANNEL_EDIT", "Edit channel", onClick = it) } diff --git a/ts3-client/core/src/main/java/eu/lixko/ts3j/client/session/ServerSession.java b/ts3-client/core/src/main/java/eu/lixko/ts3j/client/session/ServerSession.java index 6195089..a2e4627 100644 --- a/ts3-client/core/src/main/java/eu/lixko/ts3j/client/session/ServerSession.java +++ b/ts3-client/core/src/main/java/eu/lixko/ts3j/client/session/ServerSession.java @@ -637,6 +637,14 @@ public final class ServerSession { return permits("b_virtualserver_token_list"); } + /** + * Whether the server lets us list channel files ({@code i_ft_file_browse_power}); offered while + * unknown. A channel may still need more power than we have, which only the server knows. + */ + public boolean canBrowseFiles() { + return permits("i_ft_file_browse_power"); + } + /** Whether the server lets us upload an avatar ({@code i_client_max_avatar_filesize}); offered while unknown. */ public boolean canSetAvatar() { return permits("i_client_max_avatar_filesize"); diff --git a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/ChannelMenu.java b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/ChannelMenu.java index cb7dfe9..06b585c 100644 --- a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/ChannelMenu.java +++ b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/ChannelMenu.java @@ -37,9 +37,11 @@ final class ChannelMenu { menu.add(delete); menu.addSeparator(); addSubscriptionItems(menu, channel, actions); - JMenuItem files = new JMenuItem("Browse files", Icons.of("FILETRANSFER")); - files.addActionListener(a -> actions.browseFiles(channel)); - menu.add(files); + if (actions.canBrowseFiles()) { + JMenuItem files = new JMenuItem("Browse files", Icons.of("FILETRANSFER")); + files.addActionListener(a -> actions.browseFiles(channel)); + menu.add(files); + } return menu; } diff --git a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/ServerTabTreeActions.java b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/ServerTabTreeActions.java index faf8aba..573f5c5 100644 --- a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/ServerTabTreeActions.java +++ b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/ServerTabTreeActions.java @@ -340,6 +340,11 @@ final class ServerTabTreeActions implements ServerTreePanel.Actions { return conn.isConnected(); } + @Override + public boolean canBrowseFiles() { + return tab.session().canBrowseFiles(); + } + @Override public void browseFiles(ChannelNode channel) { if (!conn.canTransferFiles()) return; diff --git a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/ServerTreePanel.java b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/ServerTreePanel.java index 43af08b..02b7468 100644 --- a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/ServerTreePanel.java +++ b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/ServerTreePanel.java @@ -81,6 +81,9 @@ public final class ServerTreePanel extends JPanel { /** Whether the server is there to act on at all. */ boolean isConnected(); + /** Whether we may list channel files at all. */ + boolean canBrowseFiles(); + /** Open the file repository browser for a channel. */ void browseFiles(ChannelNode channel);