From 28da4ef085cce58415bcbfe0a29bac83e99dd43a Mon Sep 17 00:00:00 2001 From: jhengazuki Date: Mon, 25 Aug 2025 01:17:06 +0800 Subject: [PATCH] Fix crash --- .../com/fongmi/android/tv/ui/activity/VideoActivity.java | 5 +++-- .../com/fongmi/android/tv/ui/activity/VideoActivity.java | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java index 9f49ef938..4409d0607 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java @@ -223,7 +223,7 @@ public class VideoActivity extends BaseActivity implements CustomKeyDownVod.List } private Episode getEpisode() { - return (Episode) mEpisodeAdapter.get(getEpisodePosition()); + return mEpisodeAdapter.size() == 0 ? new Episode() : (Episode) mEpisodeAdapter.get(getEpisodePosition()); } private int getFlagPosition() { @@ -1102,7 +1102,8 @@ public class VideoActivity extends BaseActivity implements CustomKeyDownVod.List private void setMetadata() { String title = mHistory.getVodName(); String episode = getEpisode().getName(); - String artist = title.equals(episode) ? "" : getString(R.string.play_now, episode); + boolean empty = title.equals(episode) || episode == null; + String artist = empty ? "" : getString(R.string.play_now, episode); mPlayers.setMetadata(title, artist, mHistory.getVodPic(), mBinding.exo.getDefaultArtwork()); } diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java index 72ac73916..40395363c 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java @@ -227,7 +227,7 @@ public class VideoActivity extends BaseActivity implements Clock.Callback, Custo } private Episode getEpisode() { - return mEpisodeAdapter.getActivated(); + return mEpisodeAdapter.isEmpty() ? new Episode() : mEpisodeAdapter.getActivated(); } private int getScale() { @@ -1197,7 +1197,8 @@ public class VideoActivity extends BaseActivity implements Clock.Callback, Custo private void setMetadata() { String title = mHistory.getVodName(); String episode = getEpisode().getName(); - String artist = title.equals(episode) ? "" : getString(R.string.play_now, episode); + boolean empty = title.equals(episode) || episode == null; + String artist = empty ? "" : getString(R.string.play_now, episode); mPlayers.setMetadata(title, artist, mHistory.getVodPic(), mBinding.exo.getDefaultArtwork()); }