Skip to content

Commit bf47bb0

Browse files
Secozzicuong-tran
authored andcommitted
fix(player): Fix npe issue caused in player controls (aniyomiorg/aniyomi#1986)
(cherry picked from commit c05a75f)
1 parent 01d4d2e commit bf47bb0

File tree

4 files changed

+10
-5
lines changed

4 files changed

+10
-5
lines changed

app/src/main/java/eu/kanade/tachiyomi/ui/player/PlayerViewModel.kt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1158,6 +1158,12 @@ class PlayerViewModel @JvmOverloads constructor(
11581158
_hasPreviousEpisode.update { _ -> value }
11591159
}
11601160

1161+
fun showEpisodeListDialog() {
1162+
if (currentAnime.value != null) {
1163+
showDialog(Dialogs.EpisodeList)
1164+
}
1165+
}
1166+
11611167
/**
11621168
* Called when the activity is saved and not changing configurations. It updates the database
11631169
* to persist the current progress of the active episode.

app/src/main/java/eu/kanade/tachiyomi/ui/player/controls/PlayerControls.kt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -418,7 +418,7 @@ fun PlayerControls(
418418
TopLeftPlayerControls(
419419
animeTitle = animeTitle,
420420
mediaTitle = mediaTitle,
421-
onTitleClick = { viewModel.showDialog(Dialogs.EpisodeList) },
421+
onTitleClick = { viewModel.showEpisodeListDialog() },
422422
onBackClick = onBackPress,
423423
)
424424
}
@@ -622,8 +622,7 @@ fun PlayerControls(
622622

623623
PlayerDialogs(
624624
dialogShown = dialog,
625-
626-
episodeDisplayMode = anime!!.displayMode,
625+
episodeDisplayMode = anime?.displayMode,
627626
episodeList = playlist,
628627
currentEpisodeIndex = viewModel.getCurrentEpisodeIndex(),
629628
dateRelativeTime = viewModel.relativeTime,

app/src/main/java/eu/kanade/tachiyomi/ui/player/controls/PlayerDialogs.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ fun PlayerDialogs(
1212
dialogShown: Dialogs,
1313

1414
// Episode list
15-
episodeDisplayMode: Long,
15+
episodeDisplayMode: Long?,
1616
currentEpisodeIndex: Int,
1717
episodeList: List<Episode>,
1818
dateRelativeTime: Boolean,

app/src/main/java/eu/kanade/tachiyomi/ui/player/controls/components/dialogs/EpisodeListDialog.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ import eu.kanade.presentation.util.formatChapterNumber as formatEpisodeNumber
5050

5151
@Composable
5252
fun EpisodeListDialog(
53-
displayMode: Long,
53+
displayMode: Long?,
5454
currentEpisodeIndex: Int,
5555
episodeList: List<Episode>,
5656
dateRelativeTime: Boolean,

0 commit comments

Comments
 (0)