fix: video progress caching

PavloNetrebchuk · PavloNetrebchuk · commit 9601f28b3b42 · 2025-08-19T13:14:10.000+03:00
diff --git a/app/src/main/java/org/openedx/app/room/AppDatabase.kt b/app/src/main/java/org/openedx/app/room/AppDatabase.kt
@@ -11,6 +11,7 @@ import org.openedx.core.data.model.room.CourseProgressEntity
 import org.openedx.core.data.model.room.CourseStructureEntity
 import org.openedx.core.data.model.room.DownloadCoursePreview
 import org.openedx.core.data.model.room.OfflineXBlockProgress
+import org.openedx.core.data.model.room.VideoProgressEntity
 import org.openedx.core.data.model.room.discovery.EnrolledCourseEntity
 import org.openedx.core.data.storage.CourseDao
 import org.openedx.core.module.db.CalendarDao
@@ -22,7 +23,7 @@ import org.openedx.discovery.data.converter.DiscoveryConverter
 import org.openedx.discovery.data.model.room.CourseEntity
 import org.openedx.discovery.data.storage.DiscoveryDao
 
-const val DATABASE_VERSION = 3
+const val DATABASE_VERSION = 4
 const val DATABASE_NAME = "OpenEdX_db"
 
 @Database(
@@ -36,11 +37,13 @@ const val DATABASE_NAME = "OpenEdX_db"
         CourseCalendarStateEntity::class,
         DownloadCoursePreview::class,
         CourseEnrollmentDetailsEntity::class,
+        VideoProgressEntity::class,
         CourseProgressEntity::class,
     ],
     autoMigrations = [
         AutoMigration(1, 2),
-        AutoMigration(2, DATABASE_VERSION),
+        AutoMigration(2, 3),
+        AutoMigration(3, DATABASE_VERSION),
     ],
     version = DATABASE_VERSION
 )
diff --git a/core/src/main/java/org/openedx/core/data/model/room/VideoProgressEntity.kt b/core/src/main/java/org/openedx/core/data/model/room/VideoProgressEntity.kt
@@ -0,0 +1,16 @@
+package org.openedx.core.data.model.room
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+
+@Entity(tableName = "video_progress_table")
+data class VideoProgressEntity(
+    @PrimaryKey
+    @ColumnInfo("video_url")
+    val videoUrl: String,
+    @ColumnInfo("video_time")
+    val videoTime: Long,
+    @ColumnInfo("duration")
+    val duration: Long,
+)
diff --git a/core/src/main/java/org/openedx/core/data/storage/CourseDao.kt b/core/src/main/java/org/openedx/core/data/storage/CourseDao.kt
@@ -8,6 +8,7 @@ import androidx.room.Transaction
 import org.openedx.core.data.model.room.CourseEnrollmentDetailsEntity
 import org.openedx.core.data.model.room.CourseProgressEntity
 import org.openedx.core.data.model.room.CourseStructureEntity
+import org.openedx.core.data.model.room.VideoProgressEntity
 
 @Dao
 interface CourseDao {
@@ -40,6 +41,13 @@ interface CourseDao {
     @Query("SELECT * FROM course_enrollment_details_table WHERE id=:id")
     suspend fun getCourseEnrollmentDetailsById(id: String): CourseEnrollmentDetailsEntity?
 
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insertVideoProgressEntity(vararg videoProgressEntity: VideoProgressEntity)
+
+    @Query("SELECT * FROM video_progress_table WHERE video_url=:videoUrl")
+    suspend fun getVideoProgressByVideoUrl(videoUrl: String): VideoProgressEntity?
+
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     suspend fun insertCourseProgressEntity(vararg courseProgressEntity: CourseProgressEntity)
 
diff --git a/core/src/main/java/org/openedx/core/domain/model/Block.kt b/core/src/main/java/org/openedx/core/domain/model/Block.kt
@@ -102,6 +102,13 @@ data class Block(
         }
     }
 
+    val videoUrl: String?
+        get() = if (studentViewData?.encodedVideos?.hasVideoUrl == true) {
+            studentViewData.encodedVideos.videoUrl
+        } else {
+            studentViewData?.encodedVideos?.youtube?.url
+        }
+
     val isVideoBlock get() = type == BlockType.VIDEO
     val isDiscussionBlock get() = type == BlockType.DISCUSSION
     val isHTMLBlock get() = type == BlockType.HTML
diff --git a/core/src/main/java/org/openedx/core/system/notifier/CourseVideoPositionChanged.kt b/core/src/main/java/org/openedx/core/system/notifier/CourseVideoPositionChanged.kt
@@ -3,5 +3,6 @@ package org.openedx.core.system.notifier
 data class CourseVideoPositionChanged(
     val videoUrl: String,
     val videoTime: Long,
+    val duration: Long,
     val isPlaying: Boolean
 ) : CourseEvent
diff --git a/course/src/main/java/org/openedx/course/data/repository/CourseRepository.kt b/course/src/main/java/org/openedx/course/data/repository/CourseRepository.kt
@@ -7,6 +7,7 @@ import org.openedx.core.ApiConstants
 import org.openedx.core.data.api.CourseApi
 import org.openedx.core.data.model.BlocksCompletionBody
 import org.openedx.core.data.model.room.OfflineXBlockProgress
+import org.openedx.core.data.model.room.VideoProgressEntity
 import org.openedx.core.data.model.room.XBlockProgressData
 import org.openedx.core.data.storage.CorePreferences
 import org.openedx.core.data.storage.CourseDao
@@ -252,4 +253,14 @@ class CourseRepository(
             courseDao.insertCourseProgressEntity(response.mapToRoomEntity(courseId))
             trySend(response.mapToDomain())
         }
+
+    suspend fun saveVideoProgress(videoUrl: String, videoTime: Long, duration: Long) {
+        val videoProgressEntity = VideoProgressEntity(videoUrl, videoTime, duration)
+        courseDao.insertVideoProgressEntity(videoProgressEntity)
+    }
+
+    suspend fun getVideoProgress(videoUrl: String): VideoProgressEntity {
+        return courseDao.getVideoProgressByVideoUrl(videoUrl)
+            ?: VideoProgressEntity(videoUrl, 0L, 0L)
+    }
 }
diff --git a/course/src/main/java/org/openedx/course/domain/interactor/CourseInteractor.kt b/course/src/main/java/org/openedx/course/domain/interactor/CourseInteractor.kt
@@ -122,4 +122,6 @@ class CourseInteractor(
 
     fun getCourseProgress(courseId: String, isRefresh: Boolean) =
         repository.getCourseProgress(courseId, isRefresh)
+
+    suspend fun getVideoProgress(videoUrl: String) = repository.getVideoProgress(videoUrl)
 }
diff --git a/course/src/main/java/org/openedx/course/presentation/ui/CourseUI.kt b/course/src/main/java/org/openedx/course/presentation/ui/CourseUI.kt
@@ -612,6 +612,7 @@ fun CourseVideoSection(
     block: Block,
     videoBlocks: List<Block>,
     preview: Map<String, Any?>,
+    progress: Map<String, Float>,
     downloadedStateMap: Map<String, DownloadedState>,
     onVideoClick: (Block) -> Unit,
     onDownloadClick: (blocksIds: List<String>) -> Unit,
@@ -649,6 +650,7 @@ fun CourseVideoSection(
                 CourseVideoItem(
                     videoBlock = block,
                     preview = preview[block.id],
+                    progress = progress[block.videoUrl] ?: 0f,
                     onClick = {
                         onVideoClick(block)
                     }
@@ -663,6 +665,7 @@ fun CourseVideoSection(
 fun CourseVideoItem(
     videoBlock: Block,
     preview: Any?,
+    progress: Float,
     onClick: () -> Unit
 ) {
     Box(
@@ -731,7 +734,7 @@ fun CourseVideoItem(
         )
 
         // Progress bar (bottom)
-        if (videoBlock.completion > 0.0f) {
+        if (progress > 0.0f || videoBlock.isCompleted()) {
             Box(
                 modifier = Modifier
                     .padding(bottom = 4.dp)
@@ -745,7 +748,11 @@ fun CourseVideoItem(
                         .height(4.dp)
                         .padding(horizontal = 8.dp)
                         .clip(CircleShape),
-                    progress = videoBlock.completion.toFloat(),
+                    progress = if (videoBlock.isCompleted()) {
+                        1f
+                    } else {
+                        progress
+                    },
                     color = if (videoBlock.isCompleted()) {
                         MaterialTheme.appColors.progressBarColor
                     } else {
diff --git a/course/src/main/java/org/openedx/course/presentation/unit/video/VideoFullScreenFragment.kt b/course/src/main/java/org/openedx/course/presentation/unit/video/VideoFullScreenFragment.kt
@@ -204,6 +204,7 @@ class VideoFullScreenFragment : Fragment(R.layout.fragment_video_full_screen) {
 
     override fun onDestroyView() {
         viewModel.currentVideoTime = exoPlayer?.currentPosition ?: C.TIME_UNSET
+        viewModel.duration = exoPlayer?.duration ?: 0L
         viewModel.sendTime()
         super.onDestroyView()
     }
diff --git a/course/src/main/java/org/openedx/course/presentation/unit/video/VideoUnitFragment.kt b/course/src/main/java/org/openedx/course/presentation/unit/video/VideoUnitFragment.kt
@@ -255,6 +255,12 @@ class VideoUnitFragment : Fragment(R.layout.fragment_video_unit) {
         }
     }
 
+    override fun onDestroyView() {
+        viewModel.duration = viewModel.exoPlayer?.duration ?: 0L
+        viewModel.saveVideoProgress()
+        super.onDestroyView()
+    }
+
     @UnstableApi
     override fun onDestroy() {
         if (!requireActivity().isChangingConfigurations) {
diff --git a/course/src/main/java/org/openedx/course/presentation/unit/video/VideoUnitViewModel.kt b/course/src/main/java/org/openedx/course/presentation/unit/video/VideoUnitViewModel.kt
@@ -40,6 +40,8 @@ open class VideoUnitViewModel(
     val currentVideoTime: LiveData<Long>
         get() = _currentVideoTime
 
+    var duration = 0L
+
     protected val isUpdatedMutable = MutableLiveData(true)
     val isUpdated: LiveData<Boolean>
         get() = isUpdatedMutable
@@ -65,6 +67,7 @@ open class VideoUnitViewModel(
                 if (it is CourseVideoPositionChanged && videoUrl == it.videoUrl) {
                     isUpdatedMutable.value = false
                     _currentVideoTime.value = it.videoTime
+                    saveVideoProgress()
                     isUpdatedMutable.value = true
                     isPlaying = it.isPlaying
                 } else if (it is CourseSubtitleLanguageChanged) {
@@ -76,6 +79,12 @@ open class VideoUnitViewModel(
         }
     }
 
+    fun saveVideoProgress() {
+        viewModelScope.launch {
+            courseRepository.saveVideoProgress(videoUrl, _currentVideoTime.value ?: 0L, duration)
+        }
+    }
+
     fun downloadSubtitles() {
         viewModelScope.launch(Dispatchers.IO) {
             transcriptManager.downloadTranscriptsForVideo(getTranscriptUrl())?.let { result ->
diff --git a/course/src/main/java/org/openedx/course/presentation/unit/video/VideoViewModel.kt b/course/src/main/java/org/openedx/course/presentation/unit/video/VideoViewModel.kt
@@ -20,6 +20,7 @@ class VideoViewModel(
 
     var videoUrl = ""
     var currentVideoTime = 0L
+    var duration = 0L
     var isPlaying: Boolean? = null
 
     private var isBlockAlreadyCompleted = false
@@ -31,7 +32,8 @@ class VideoViewModel(
                     CourseVideoPositionChanged(
                         videoUrl,
                         currentVideoTime,
-                        isPlaying ?: false
+                        duration,
+                        isPlaying == true
                     )
                 )
             }
diff --git a/course/src/main/java/org/openedx/course/presentation/unit/video/YoutubeVideoFullScreenFragment.kt b/course/src/main/java/org/openedx/course/presentation/unit/video/YoutubeVideoFullScreenFragment.kt
@@ -124,6 +124,11 @@ class YoutubeVideoFullScreenFragment : Fragment(R.layout.fragment_youtube_video_
                     }
                     youTubePlayer.addListener(youtubeTrackerListener)
                 }
+
+                override fun onVideoDuration(youTubePlayer: YouTubePlayer, duration: Float) {
+                    viewModel.duration = (duration * 1000).toLong()
+                    super.onVideoDuration(youTubePlayer, duration)
+                }
             },
             options
         )
diff --git a/course/src/main/java/org/openedx/course/presentation/unit/video/YoutubeVideoUnitFragment.kt b/course/src/main/java/org/openedx/course/presentation/unit/video/YoutubeVideoUnitFragment.kt
@@ -220,6 +220,11 @@ class YoutubeVideoUnitFragment : Fragment(R.layout.fragment_youtube_video_unit)
                     CourseAnalyticsKey.YOUTUBE.key
                 )
             }
+
+            override fun onVideoDuration(youTubePlayer: YouTubePlayer, duration: Float) {
+                viewModel.duration = (duration * 1000).toLong()
+                super.onVideoDuration(youTubePlayer, duration)
+            }
         }
 
         if (!isPlayerInitialized) {
@@ -234,6 +239,7 @@ class YoutubeVideoUnitFragment : Fragment(R.layout.fragment_youtube_video_unit)
     }
 
     override fun onDestroyView() {
+        viewModel.saveVideoProgress()
         isPlayerInitialized = false
         _youTubePlayer = null
         super.onDestroyView()
diff --git a/course/src/main/java/org/openedx/course/presentation/videos/CourseContentVideoScreen.kt b/course/src/main/java/org/openedx/course/presentation/videos/CourseContentVideoScreen.kt
@@ -186,7 +186,8 @@ private fun CourseVideosUI(
                                                     downloadedStateMap = uiState.downloadedState,
                                                     onVideoClick = onVideoClick,
                                                     onDownloadClick = onDownloadClick,
-                                                    preview = uiState.videoPreview
+                                                    preview = uiState.videoPreview,
+                                                    progress = uiState.videoProgress,
                                                 )
                                             }
                                         }
@@ -226,7 +227,8 @@ private fun CourseVideosScreenPreview() {
                     allSize = 0
                 ),
                 isCompletedSectionsShown = false,
-                videoPreview = mapOf()
+                videoPreview = mapOf(),
+                videoProgress = mapOf(),
             ),
             onVideoClick = { },
             onDownloadClick = {},
@@ -272,7 +274,8 @@ private fun CourseVideosScreenTabletPreview() {
                     allSize = 0
                 ),
                 isCompletedSectionsShown = true,
-                videoPreview = mapOf()
+                videoPreview = mapOf(),
+                videoProgress = mapOf(),
             ),
             onVideoClick = { },
             onDownloadClick = {},
diff --git a/course/src/main/java/org/openedx/course/presentation/videos/CourseVideoUIState.kt b/course/src/main/java/org/openedx/course/presentation/videos/CourseVideoUIState.kt
@@ -14,6 +14,7 @@ sealed class CourseVideoUIState {
         val downloadModelsSize: DownloadModelsSize,
         val isCompletedSectionsShown: Boolean,
         val videoPreview: Map<String, Any?>,
+        val videoProgress: Map<String, Float>,
     ) : CourseVideoUIState()
 
     data object Empty : CourseVideoUIState()
diff --git a/course/src/main/java/org/openedx/course/presentation/videos/CourseVideoViewModel.kt b/course/src/main/java/org/openedx/course/presentation/videos/CourseVideoViewModel.kt
@@ -144,8 +144,14 @@ class CourseVideoViewModel(
                             downloadingModels.find { block.id == it.id }?.path
                         )
                     }
+                    val videoProgress = courseVideos.values.flatten().associate { block ->
+                        val videoUrl = block.videoUrl ?: return@launch
+                        val videoProgressEntity = interactor.getVideoProgress(videoUrl)
+                        videoUrl to videoProgressEntity.videoTime.toFloat() / videoProgressEntity.duration
+                    }
                     val isCompletedSectionsShown =
-                        (_uiState.value as? CourseVideoUIState.CourseData)?.isCompletedSectionsShown == false
+                        (_uiState.value as? CourseVideoUIState.CourseData)?.isCompletedSectionsShown
+                            ?: false
 
                     _uiState.value =
                         CourseVideoUIState.CourseData(
@@ -155,7 +161,8 @@ class CourseVideoViewModel(
                             subSectionsDownloadsCount = subSectionsDownloadsCount,
                             downloadModelsSize = getDownloadModelsSize(),
                             isCompletedSectionsShown = isCompletedSectionsShown,
-                            videoPreview = videoPreview
+                            videoPreview = videoPreview,
+                            videoProgress = videoProgress,
                         )
                 }
                 courseNotifier.send(CourseLoading(false))

Original file line number	Diff line number	Diff line change
`@@ -102,6 +102,13 @@ data class Block(`
`102`	`102`	`}`
`103`	`103`	`}`
`104`	`104`
	`105`	`+ val videoUrl: String?`
	`106`	`+ get() = if (studentViewData?.encodedVideos?.hasVideoUrl == true) {`
	`107`	`+ studentViewData.encodedVideos.videoUrl`
	`108`	`+ } else {`
	`109`	`+ studentViewData?.encodedVideos?.youtube?.url`
	`110`	`+ }`
	`111`	`+`
`105`	`112`	`val isVideoBlock get() = type == BlockType.VIDEO`
`106`	`113`	`val isDiscussionBlock get() = type == BlockType.DISCUSSION`
`107`	`114`	`val isHTMLBlock get() = type == BlockType.HTML`
Original file line number	Diff line number	Diff line change
`@@ -122,4 +122,6 @@ class CourseInteractor(`
`122`	`122`
`123`	`123`	`fun getCourseProgress(courseId: String, isRefresh: Boolean) =`
`124`	`124`	`repository.getCourseProgress(courseId, isRefresh)`
	`125`	`+`
	`126`	`+ suspend fun getVideoProgress(videoUrl: String) = repository.getVideoProgress(videoUrl)`
`125`	`127`	`}`
Original file line number	Diff line number	Diff line change
`@@ -204,6 +204,7 @@ class VideoFullScreenFragment : Fragment(R.layout.fragment_video_full_screen) {`
`204`	`204`
`205`	`205`	`override fun onDestroyView() {`
`206`	`206`	`viewModel.currentVideoTime = exoPlayer?.currentPosition ?: C.TIME_UNSET`
	`207`	`+ viewModel.duration = exoPlayer?.duration ?: 0L`
`207`	`208`	`viewModel.sendTime()`
`208`	`209`	`super.onDestroyView()`
`209`	`210`	`}`
Original file line number	Diff line number	Diff line change
`@@ -255,6 +255,12 @@ class VideoUnitFragment : Fragment(R.layout.fragment_video_unit) {`
`255`	`255`	`}`
`256`	`256`	`}`
`257`	`257`
	`258`	`+ override fun onDestroyView() {`
	`259`	`+ viewModel.duration = viewModel.exoPlayer?.duration ?: 0L`
	`260`	`+ viewModel.saveVideoProgress()`
	`261`	`+ super.onDestroyView()`
	`262`	`+ }`
	`263`	`+`
`258`	`264`	`@UnstableApi`
`259`	`265`	`override fun onDestroy() {`
`260`	`266`	`if (!requireActivity().isChangingConfigurations) {`