diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/DetailActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/DetailActivity.java index d5d2dbdb8..434dc4f52 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/DetailActivity.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/DetailActivity.java @@ -253,6 +253,7 @@ public class DetailActivity extends BaseActivity implements KeyDown.Listener { for (int i = 0; i < mFlagAdapter.size(); i++) ((Vod.Flag) mFlagAdapter.get(i)).toggle(mCurrent == i, item); mEpisodeAdapter.notifyArrayItemRangeChanged(0, mEpisodeAdapter.size()); mHandler.post(() -> mBinding.episode.setSelectedPosition(getEpisodePosition())); + if (mEpisodeAdapter.size() == 0) return; getPlayer(false); } diff --git a/app/src/main/java/com/fongmi/android/tv/utils/Json.java b/app/src/main/java/com/fongmi/android/tv/utils/Json.java index 3e3351dd8..d0dbe3268 100644 --- a/app/src/main/java/com/fongmi/android/tv/utils/Json.java +++ b/app/src/main/java/com/fongmi/android/tv/utils/Json.java @@ -24,6 +24,7 @@ public class Json { } public static JsonObject safeObject(JsonElement element) { + if (element.getAsString().isEmpty()) return null; if (element.isJsonObject()) return element.getAsJsonObject(); else if (element.isJsonPrimitive()) return JsonParser.parseString(element.getAsJsonPrimitive().getAsString()).getAsJsonObject(); return null;