fix: changes according code review feedback

Author: PavloNetrebchuk

app/src/main/java/org/openedx/app/di/AppModule.kt

@@ -35,6 +35,7 @@ import org.openedx.core.data.model.CourseEnrollments
 import org.openedx.core.data.storage.CalendarPreferences
 import org.openedx.core.data.storage.CorePreferences
 import org.openedx.core.data.storage.InAppReviewPreferences
+import org.openedx.core.domain.helper.VideoPreviewHelper
 import org.openedx.core.module.DownloadWorkerController
 import org.openedx.core.module.TranscriptManager
 import org.openedx.core.module.download.DownloadHelper
@@ -216,6 +217,7 @@ val appModule = module {
     factory { MicrosoftAuthHelper() }
     factory { BrowserAuthHelper(get()) }
     factory { OAuthHelper(get(), get(), get()) }
+    factory { VideoPreviewHelper(get(), get()) }
 
     factory { FileUtil(get(), get<ResourceManager>().getString(R.string.app_name)) }
     single { DownloadHelper(get(), get()) }

core/src/main/java/org/openedx/core/domain/helper/VideoPreviewHelper.kt

@@ -0,0 +1,62 @@
+package org.openedx.core.domain.helper
+
+import android.content.Context
+import org.openedx.core.domain.model.Block
+import org.openedx.core.system.connection.NetworkConnection
+import org.openedx.core.utils.VideoPreview
+
+/**
+ * Helper class for handling video preview generation.
+ * This class encapsulates the logic for getting video previews from blocks,
+ * avoiding the need to inject Context directly into ViewModels.
+ */
+class VideoPreviewHelper(
+    private val context: Context,
+    private val networkConnection: NetworkConnection
+) {
+
+    /**
+     * Gets video preview for a single block
+     * @param block The block to get video preview for
+     * @param offlineUrl Optional offline URL for the video
+     * @return VideoPreview object or null if no preview available
+     */
+    fun getVideoPreview(block: Block, offlineUrl: String? = null): VideoPreview? {
+        return block.getVideoPreview(
+            context = context,
+            isOnline = networkConnection.isOnline(),
+            offlineUrl = offlineUrl
+        )
+    }
+
+    /**
+     * Gets video previews for multiple blocks
+     * @param blocks List of blocks to get video previews for
+     * @param offlineUrls Optional map of block IDs to offline URLs
+     * @return Map of block IDs to VideoPreview objects
+     */
+    fun getVideoPreviews(
+        blocks: List<Block>,
+        offlineUrls: Map<String, String>? = null
+    ): Map<String, VideoPreview?> {
+        return blocks.associate { block ->
+            val offlineUrl = offlineUrls?.get(block.id)
+            block.id to getVideoPreview(block, offlineUrl)
+        }
+    }
+
+    /**
+     * Gets video preview for a single block with a specific offline URL
+     * @param blockId The ID of the block
+     * @param block The block to get video preview for
+     * @param offlineUrl Optional offline URL for the video
+     * @return Pair of block ID and VideoPreview object or null
+     */
+    fun getVideoPreviewWithId(
+        blockId: String,
+        block: Block,
+        offlineUrl: String? = null
+    ): Pair<String, VideoPreview?> {
+        return blockId to getVideoPreview(block, offlineUrl)
+    }
+}

course/src/main/java/org/openedx/course/presentation/home/CourseHomeViewModel.kt

@@ -1,6 +1,5 @@
 package org.openedx.course.presentation.home
 
-import android.content.Context
 import androidx.fragment.app.FragmentManager
 import androidx.lifecycle.viewModelScope
 import kotlinx.coroutines.Dispatchers
@@ -18,6 +17,7 @@ import org.openedx.core.BlockType
 import org.openedx.core.R
 import org.openedx.core.config.Config
 import org.openedx.core.data.storage.CorePreferences
+import org.openedx.core.domain.helper.VideoPreviewHelper
 import org.openedx.core.domain.model.Block
 import org.openedx.core.domain.model.CourseComponentStatus
 import org.openedx.core.domain.model.CourseDatesBannerInfo
@@ -54,7 +54,6 @@ import org.openedx.course.R as courseR
 class CourseHomeViewModel(
     val courseId: String,
     private val courseTitle: String,
-    private val context: Context,
     private val config: Config,
     private val interactor: CourseInteractor,
     private val resourceManager: ResourceManager,
@@ -65,6 +64,7 @@ class CourseHomeViewModel(
     private val downloadDialogManager: DownloadDialogManager,
     private val fileUtil: FileUtil,
     val courseRouter: CourseRouter,
+    private val videoPreviewHelper: VideoPreviewHelper,
     coreAnalytics: CoreAnalytics,
     downloadDao: DownloadDao,
     workerController: DownloadWorkerController,
@@ -270,11 +270,9 @@ class CourseHomeViewModel(
 
     private fun getVideoPreview(videoBlock: Block?) {
         viewModelScope.launch(Dispatchers.IO) {
-            val videoPreview = videoBlock?.getVideoPreview(
-                context,
-                networkConnection.isOnline(),
-                null
-            )
+            val videoPreview = videoBlock?.let { block ->
+                videoPreviewHelper.getVideoPreview(block, null)
+            }
             _uiState.value = (_uiState.value as? CourseHomeUIState.CourseData)
                 ?.copy(
                     videoPreview = videoPreview

course/src/main/java/org/openedx/course/presentation/unit/container/CourseUnitContainerViewModel.kt

@@ -1,6 +1,5 @@
 package org.openedx.course.presentation.unit.container
 
-import android.content.Context
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.viewModelScope
@@ -13,6 +12,7 @@ import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.withContext
 import org.openedx.core.BlockType
 import org.openedx.core.config.Config
+import org.openedx.core.domain.helper.VideoPreviewHelper
 import org.openedx.core.domain.model.Block
 import org.openedx.core.extension.safeDivBy
 import org.openedx.core.module.db.DownloadModel
@@ -34,12 +34,12 @@ class CourseUnitContainerViewModel(
     val courseId: String,
     val unitId: String,
     val mode: CourseViewMode,
-    private val context: Context,
     private val config: Config,
     private val interactor: CourseInteractor,
     private val notifier: CourseNotifier,
     private val analytics: CourseAnalytics,
     private val networkConnection: NetworkConnection,
+    private val videoPreviewHelper: VideoPreviewHelper,
 ) : BaseViewModel() {
 
     private val blocks = ArrayList<Block>()
@@ -408,13 +408,7 @@ class CourseUnitContainerViewModel(
     private suspend fun loadVideoPreview() {
         val videoBlocks = getAllVideoBlocks()
         val videoPreview = withContext(Dispatchers.IO) {
-            videoBlocks.associate { block ->
-                block.id to block.getVideoPreview(
-                    context,
-                    networkConnection.isOnline(),
-                    null
-                )
-            }
+            videoPreviewHelper.getVideoPreviews(videoBlocks)
         }
         _videoPreview.value = videoPreview
     }

course/src/main/java/org/openedx/course/presentation/videos/CourseVideoViewModel.kt

@@ -1,7 +1,5 @@
 package org.openedx.course.presentation.videos
 
-import android.annotation.SuppressLint
-import android.content.Context
 import androidx.fragment.app.FragmentManager
 import androidx.lifecycle.viewModelScope
 import kotlinx.coroutines.Dispatchers
@@ -15,6 +13,7 @@ import kotlinx.coroutines.launch
 import org.openedx.core.BlockType
 import org.openedx.core.config.Config
 import org.openedx.core.data.storage.CorePreferences
+import org.openedx.core.domain.helper.VideoPreviewHelper
 import org.openedx.core.domain.model.Block
 import org.openedx.core.extension.safeDivBy
 import org.openedx.core.module.DownloadWorkerController
@@ -37,10 +36,8 @@ import org.openedx.foundation.presentation.UIMessage
 import org.openedx.foundation.system.ResourceManager
 import org.openedx.foundation.utils.FileUtil
 
-@SuppressLint("StaticFieldLeak")
 class CourseVideoViewModel(
     val courseId: String,
-    private val context: Context,
     private val config: Config,
     private val interactor: CourseInteractor,
     private val resourceManager: ResourceManager,
@@ -51,6 +48,7 @@ class CourseVideoViewModel(
     private val fileUtil: FileUtil,
     val courseRouter: CourseRouter,
     private val analytics: CourseAnalytics,
+    private val videoPreviewHelper: VideoPreviewHelper,
     coreAnalytics: CoreAnalytics,
     downloadDao: DownloadDao,
     workerController: DownloadWorkerController,
@@ -188,10 +186,11 @@ class CourseVideoViewModel(
         viewModelScope.launch(Dispatchers.IO) {
             val downloadingModels = getDownloadModelList()
             courseVideos.values.flatten().forEach { block ->
-                val previewMap = block.id to block.getVideoPreview(
-                    context,
-                    networkConnection.isOnline(),
-                    downloadingModels.find { block.id == it.id }?.path
+                val offlineUrl = downloadingModels.find { block.id == it.id }?.path
+                val previewMap = videoPreviewHelper.getVideoPreviewWithId(
+                    blockId = block.id,
+                    block = block,
+                    offlineUrl = offlineUrl
                 )
                 val currentUiState =
                     (_uiState.value as? CourseVideoUIState.CourseData) ?: return@forEach