From 2f71fa56648cd2ab760b7ba627553da2f0a8b77e Mon Sep 17 00:00:00 2001 From: LagradOst Date: Thu, 28 Oct 2021 13:05:23 +0200 Subject: [PATCH] fixed android 12 issue --- .../cloudstream3/ui/player/PlayerFragment.kt | 19 ++++++++++--------- .../utils/VideoDownloadManager.kt | 2 +- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerFragment.kt index 1b7cb102..9e016807 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerFragment.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerFragment.kt @@ -868,28 +868,28 @@ class PlayerFragment : Fragment() { } private fun updateLock() { - video_locked_img.setImageResource(if (isLocked) R.drawable.video_locked else R.drawable.video_unlocked) + video_locked_img?.setImageResource(if (isLocked) R.drawable.video_locked else R.drawable.video_unlocked) val color = if (isLocked) ContextCompat.getColor(requireContext(), R.color.videoColorPrimary) else Color.WHITE - video_locked_text.setTextColor(color) - video_locked_img.setColorFilter(color) + video_locked_text?.setTextColor(color) + video_locked_img?.setColorFilter(color) val isClick = !isLocked - exo_play.isClickable = isClick - exo_pause.isClickable = isClick + exo_play?.isClickable = isClick + exo_pause?.isClickable = isClick exo_ffwd?.isClickable = isClick exo_rew?.isClickable = isClick - exo_prev.isClickable = isClick - video_go_back.isClickable = isClick - exo_progress.isClickable = isClick + exo_prev?.isClickable = isClick + video_go_back?.isClickable = isClick + exo_progress?.isClickable = isClick //next_episode_btt.isClickable = isClick playback_speed_btt?.isClickable = isClick skip_op?.isClickable = isClick skip_episode?.isClickable = isClick resize_player?.isClickable = isClick - exo_progress.isEnabled = isClick + exo_progress?.isEnabled = isClick player_media_route_button?.isEnabled = isClick if (isClick && isShowing) { player_pause_holder?.alpha = 1f @@ -1215,6 +1215,7 @@ class PlayerFragment : Fragment() { @SuppressLint("SetTextI18n") override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) + updateLock() context?.let { ctx -> setPreferredSubLanguage(ctx.getAutoSelectLanguageISO639_1()) } diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/VideoDownloadManager.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/VideoDownloadManager.kt index 385cb359..de15e20d 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/utils/VideoDownloadManager.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/utils/VideoDownloadManager.kt @@ -348,7 +348,7 @@ object VideoDownloadManager { // BECAUSE episodes lying near will have the same id +1, index will give the same requested as the previous episode, *100000 fixes this context, (4337 + index * 100000 + ep.id), actionResultIntent, - PendingIntent.FLAG_UPDATE_CURRENT + PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE ) builder.addAction(