From 15863230b925a02fc74efd9203fcedc6d4fe1af8 Mon Sep 17 00:00:00 2001 From: FongMi Date: Thu, 3 Nov 2022 16:55:39 +0800 Subject: [PATCH 1/4] Fix crach --- .../java/com/fongmi/android/tv/ui/activity/DetailActivity.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 ed1a5631e..f799b2ebd 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 @@ -53,6 +53,7 @@ import com.fongmi.android.tv.utils.Prefers; import com.fongmi.android.tv.utils.ResUtil; import com.google.android.exoplayer2.Player; import com.google.android.exoplayer2.ui.StyledPlayerView; +import com.google.android.exoplayer2.util.Log; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; @@ -266,7 +267,7 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis } private void setFlagActivated(Vod.Flag item) { - if (item.isActivated()) return; + if (mFlagAdapter.size() == 0 || item.isActivated()) return; for (int i = 0; i < mFlagAdapter.size(); i++) ((Vod.Flag) mFlagAdapter.get(i)).setActivated(item); mBinding.flag.setSelectedPosition(mFlagAdapter.indexOf(item)); mEpisodeAdapter.setItems(item.getEpisodes(), null); From 201768cba68b2a6208b61018b6d6daed115f14c9 Mon Sep 17 00:00:00 2001 From: FongMi Date: Thu, 3 Nov 2022 17:38:35 +0800 Subject: [PATCH 3/4] Fix bug --- .../java/com/fongmi/android/tv/ui/activity/SettingActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingActivity.java index f6b36ad71..a593d482d 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingActivity.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingActivity.java @@ -92,7 +92,7 @@ public class SettingActivity extends BaseActivity implements ConfigCallback, Sit } private void checkPermission() { - if (config.getUrl().startsWith("file/") && Build.VERSION.SDK_INT >= Build.VERSION_CODES.R && !Environment.isExternalStorageManager()) { + if (config.getUrl().startsWith("file") && Build.VERSION.SDK_INT >= Build.VERSION_CODES.R && !Environment.isExternalStorageManager()) { openSetting(); } else if (config.getUrl().startsWith("file") && Build.VERSION.SDK_INT < Build.VERSION_CODES.R && ContextCompat.checkSelfPermission(this, Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) { launcherString.launch(Manifest.permission.READ_EXTERNAL_STORAGE); From 0437970246ff566f65f08dd29998bb55b9001f0d Mon Sep 17 00:00:00 2001 From: FongMi Date: Thu, 3 Nov 2022 18:23:19 +0800 Subject: [PATCH 4/4] Update to 1.4.1 --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index e412bae49..6987ac700 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ android { applicationId "com.fongmi.android.tv" minSdk 21 targetSdk 33 - versionCode 40 - versionName "1.4.0" + versionCode 41 + versionName "1.4.1" ndk { abiFilters "armeabi-v7a" } }