fix: update downloading state if new blocks was added

Author: PavloNetrebchuk

downloads/src/main/java/org/openedx/downloads/presentation/download/DownloadsScreen.kt

@@ -284,9 +284,9 @@ private fun CourseItem(
         .filter { it.downloadedState == DownloadedState.DOWNLOADED }
         .sumOf { it.size }
     val availableSize = downloadCoursePreview.totalSize - downloadedSize
-    val availableSizeString = availableSize.toFileSize(space = false)
+    val availableSizeString = availableSize.toFileSize(space = false, round = 1)
     val progress: Float = try {
-        downloadedSize.toFloat() / availableSize.toFloat()
+        downloadedSize.toFloat() / downloadCoursePreview.totalSize.toFloat()
     } catch (_: ArithmeticException) {
         0f
     }
@@ -350,7 +350,7 @@ private fun CourseItem(
                             color = MaterialTheme.appColors.successGreen,
                             text = stringResource(
                                 R.string.downloaded_downloaded_size,
-                                downloadedSize.toFileSize(space = false)
+                                downloadedSize.toFileSize(space = false, round = 1)
                             )
                         )
                     }

downloads/src/main/java/org/openedx/downloads/presentation/download/DownloadsViewModel.kt

@@ -138,7 +138,13 @@ class DownloadsViewModel(
                     val computedState = if (blockStates.isEmpty()) {
                         DownloadedState.NOT_DOWNLOADED
                     } else {
-                        determineCourseState(blockStates)
+                        val downloadedSize = _uiState.value.downloadModels
+                            .filter { it.courseId == courseId }
+                            .sumOf { it.size }
+                        val courseSize = _uiState.value.downloadCoursePreviews
+                            .find { it.id == courseId }?.totalSize ?: 0
+                        val isSizeMatch: Boolean = downloadedSize.toDouble() / courseSize >= 0.95
+                        determineCourseState(blockStates, isSizeMatch)
                     }
                     if (currentCourseState == DownloadedState.LOADING_COURSE_STRUCTURE &&
                         computedState == DownloadedState.NOT_DOWNLOADED
@@ -156,9 +162,12 @@ class DownloadsViewModel(
         }
     }
 
-    private fun determineCourseState(blockStates: List<DownloadedState>): DownloadedState {
+    private fun determineCourseState(
+        blockStates: List<DownloadedState>,
+        isSizeMatch: Boolean
+    ): DownloadedState {
         return when {
-            blockStates.all { it == DownloadedState.DOWNLOADED } -> DownloadedState.DOWNLOADED
+            blockStates.all { it == DownloadedState.DOWNLOADED } && isSizeMatch -> DownloadedState.DOWNLOADED
             blockStates.all { it == DownloadedState.WAITING } -> DownloadedState.WAITING
             blockStates.any { it == DownloadedState.DOWNLOADING } -> DownloadedState.DOWNLOADING
             else -> DownloadedState.NOT_DOWNLOADED
@@ -169,7 +178,9 @@ class DownloadsViewModel(
         viewModelScope.launch(Dispatchers.IO) {
             updateLoadingState(isLoading = !refresh, isRefreshing = refresh)
             interactor.getDownloadCoursesPreview(refresh)
-                .onCompletion { resetLoadingState() }
+                .onCompletion {
+                    resetLoadingState()
+                }
                 .catch { e ->
                     emitErrorMessage(e)
                 }
@@ -183,7 +194,11 @@ class DownloadsViewModel(
                         .forEach { addDownloadableChildrenForSequentialBlock(it) }
                     initDownloadModelsStatus()
                     _uiState.update { state ->
-                        state.copy(downloadCoursePreviews = downloadCoursePreviews)
+                        state.copy(
+                            downloadCoursePreviews = downloadCoursePreviews,
+                            isLoading = false,
+                            isRefreshing = false
+                        )
                     }
                 }
         }
@@ -195,12 +210,6 @@ class DownloadsViewModel(
         }
     }
 
-    private fun resetLoadingState() {
-        _uiState.update { state ->
-            state.copy(isLoading = false, isRefreshing = false)
-        }
-    }
-
     private suspend fun emitErrorMessage(e: Throwable) {
         val text = if (e.isInternetError()) {
             R.string.core_error_no_connection
@@ -213,7 +222,6 @@ class DownloadsViewModel(
     }
 
     fun refreshData() {
-        _uiState.update { it.copy(isRefreshing = true) }
         fetchDownloads(refresh = true)
     }
 
@@ -343,6 +351,12 @@ class DownloadsViewModel(
         )
     }
 
+    private fun resetLoadingState() {
+        _uiState.update { state ->
+            state.copy(isLoading = false, isRefreshing = false)
+        }
+    }
+
     private fun updateCourseState(courseId: String, state: DownloadedState) {
         _uiState.update { currentState ->
             currentState.copy(

downloads/src/test/java/org/openedx/downloads/DownloadsViewModelTest.kt

@@ -43,6 +43,7 @@ import org.openedx.core.presentation.CoreAnalytics
 import org.openedx.core.presentation.DownloadsAnalytics
 import org.openedx.core.presentation.dialog.downloaddialog.DownloadDialogManager
 import org.openedx.core.system.connection.NetworkConnection
+import org.openedx.core.system.notifier.CourseNotifier
 import org.openedx.core.system.notifier.DiscoveryNotifier
 import org.openedx.downloads.domain.interactor.DownloadInteractor
 import org.openedx.downloads.presentation.DownloadsRouter
@@ -76,6 +77,7 @@ class DownloadsViewModelTest {
     private val downloadHelper = mockk<DownloadHelper>(relaxed = true)
     private val router = mockk<DownloadsRouter>(relaxed = true)
     private val discoveryNotifier = mockk<DiscoveryNotifier>(relaxed = true)
+    private val courseNotifier = mockk<CourseNotifier>(relaxed = true)
 
     private val noInternet = "No connection"
     private val unknownError = "Unknown error"
@@ -220,6 +222,7 @@ class DownloadsViewModelTest {
             config,
             analytics,
             discoveryNotifier,
+            courseNotifier,
             router,
             preferencesManager,
             coreAnalytics,
@@ -246,6 +249,7 @@ class DownloadsViewModelTest {
             config,
             analytics,
             discoveryNotifier,
+            courseNotifier,
             router,
             preferencesManager,
             coreAnalytics,
@@ -287,6 +291,7 @@ class DownloadsViewModelTest {
                 config,
                 analytics,
                 discoveryNotifier,
+                courseNotifier,
                 router,
                 preferencesManager,
                 coreAnalytics,
@@ -320,6 +325,7 @@ class DownloadsViewModelTest {
             config,
             analytics,
             discoveryNotifier,
+            courseNotifier,
             router,
             preferencesManager,
             coreAnalytics,
@@ -359,6 +365,7 @@ class DownloadsViewModelTest {
             config,
             analytics,
             discoveryNotifier,
+            courseNotifier,
             router,
             preferencesManager,
             coreAnalytics,