justinzeus/Wholphin
1
0
Fork 0
mirror of https://github.com/JustinZeus/Wholphin.git synced 2026-07-08 23:51:21 +02:00
Code Issues Projects Packages Wiki Activity Actions

Disable subtitle download button if user doesn't have permission (#671)

Browse source 
## Description
Just a UI change to disable the Search & Download subtitles button if
the user doesn't have permission to manage subtitles.

This avoids the 403 error if the user attempts to use it.

### Related issues
Closes #483
This commit is contained in:
Ray 2026-01-11 13:21:02 -05:00 • committed by GitHub
parent ed67e5575f
commit 2377a15611
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 9 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/com/github/damontecres/wholphin/ui/playback/PlaybackDialog.kt
View file

@ -53,6 +53,7 @@ data class PlaybackSettings(
val playbackSpeed: Float, val playbackSpeed: Float,
val contentScale: ContentScale, val contentScale: ContentScale,
val subtitleDelay: Duration, val subtitleDelay: Duration,
val hasSubtitleDownloadPermission: Boolean,
) )
@Composable @Composable
@ -96,6 +97,7 @@ fun PlaybackDialog(
SubtitleChoiceBottomDialog( SubtitleChoiceBottomDialog(
choices = settings.subtitleStreams, choices = settings.subtitleStreams,
currentChoice = settings.subtitleIndex, currentChoice = settings.subtitleIndex,
hasDownloadPermission = settings.hasSubtitleDownloadPermission,
onDismissRequest = { onDismissRequest = {
onControllerInteraction.invoke() onControllerInteraction.invoke()
onDismissRequest.invoke() onDismissRequest.invoke()
@ -275,6 +277,7 @@ fun SubtitleChoiceBottomDialog(
onSelectChoice: (Int) -> Unit, onSelectChoice: (Int) -> Unit,
onSelectSearch: () -> Unit, onSelectSearch: () -> Unit,
gravity: Int, gravity: Int,
hasDownloadPermission: Boolean,
currentChoice: Int? = null, currentChoice: Int? = null,
) { ) {
// TODO enforcing a width ends up ignore the gravity // TODO enforcing a width ends up ignore the gravity
@ -366,6 +369,7 @@ fun SubtitleChoiceBottomDialog(
HorizontalDivider() HorizontalDivider()
ListItem( ListItem(
selected = false, selected = false,
enabled = hasDownloadPermission,
onClick = onSelectSearch, onClick = onSelectSearch,
leadingContent = {}, leadingContent = {},
headlineContent = { headlineContent = {

3
app/src/main/java/com/github/damontecres/wholphin/ui/playback/PlaybackPage.kt
View file

@ -130,6 +130,7 @@ fun PlaybackPage(
val player = viewModel.player val player = viewModel.player
val mediaInfo by viewModel.currentMediaInfo.observeAsState() val mediaInfo by viewModel.currentMediaInfo.observeAsState()
val userDto by viewModel.currentUserDto.observeAsState()
val currentPlayback by viewModel.currentPlayback.collectAsState() val currentPlayback by viewModel.currentPlayback.collectAsState()
val currentItemPlayback by viewModel.currentItemPlayback.observeAsState( val currentItemPlayback by viewModel.currentItemPlayback.observeAsState(
@ -561,6 +562,8 @@ fun PlaybackPage(
playbackSpeed = playbackSpeed, playbackSpeed = playbackSpeed,
contentScale = contentScale, contentScale = contentScale,
subtitleDelay = subtitleDelay, subtitleDelay = subtitleDelay,
hasSubtitleDownloadPermission =
remember(userDto) { userDto?.policy?.let { it.isAdministrator || it.enableSubtitleManagement } == true },
), ),
onDismissRequest = { onDismissRequest = {
playbackDialog = null playbackDialog = null

2
app/src/main/java/com/github/damontecres/wholphin/ui/playback/PlaybackViewModel.kt
View file

@ -168,6 +168,8 @@ class PlaybackViewModel
val subtitleSearch = MutableLiveData<SubtitleSearch?>(null) val subtitleSearch = MutableLiveData<SubtitleSearch?>(null)
val subtitleSearchLanguage = MutableLiveData<String>(Locale.current.language) val subtitleSearchLanguage = MutableLiveData<String>(Locale.current.language)
val currentUserDto = serverRepository.currentUserDto
init { init {
addCloseable { addCloseable {
player.removeListener(this@PlaybackViewModel) player.removeListener(this@PlaybackViewModel)