fix: crash when internet disconnected right after opening a course

edx · Aug 8, 2024 · 19755ee · 19755ee
1 parent d174b9f
commit 19755ee
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 19 deletions.
diff --git a/course/src/main/java/org/openedx/course/presentation/outline/CourseOutlineScreen.kt b/course/src/main/java/org/openedx/course/presentation/outline/CourseOutlineScreen.kt
@@ -342,6 +342,10 @@ private fun CourseOutlineUI(
                             }
                         }
 
+                        CourseOutlineUIState.Error -> {
+                            NoContentScreen(noContentScreenType = NoContentScreenType.COURSE_OUTLINE)
+                        }
+
                         CourseOutlineUIState.Loading -> {
                             CircularProgress()
                         }

diff --git a/course/src/main/java/org/openedx/course/presentation/outline/CourseOutlineUIState.kt b/course/src/main/java/org/openedx/course/presentation/outline/CourseOutlineUIState.kt
@@ -17,5 +17,6 @@ sealed class CourseOutlineUIState {
         val datesBannerInfo: CourseDatesBannerInfo,
     ) : CourseOutlineUIState()
 
+    data object Error : CourseOutlineUIState()
     data object Loading : CourseOutlineUIState()
 }
diff --git a/course/src/main/java/org/openedx/course/presentation/outline/CourseOutlineViewModel.kt b/course/src/main/java/org/openedx/course/presentation/outline/CourseOutlineViewModel.kt
@@ -218,6 +218,7 @@ class CourseOutlineViewModel(
                     datesBannerInfo = datesBannerInfo
                 )
             } catch (e: Exception) {
+                _uiState.value = CourseOutlineUIState.Error
                 if (e.isInternetError()) {
                     _uiMessage.emit(UIMessage.SnackBarMessage(resourceManager.getString(R.string.core_error_no_connection)))
                 } else {

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
@@ -145,27 +145,31 @@ class CourseVideoViewModel(
 
     fun getVideos() {
         viewModelScope.launch {
-            var courseStructure = interactor.getCourseStructureForVideos(courseId)
-            val blocks = courseStructure.blockData
-            if (blocks.isEmpty()) {
+            try {
+                var courseStructure = interactor.getCourseStructureForVideos(courseId)
+                val blocks = courseStructure.blockData
+                if (blocks.isEmpty()) {
+                    _uiState.value = CourseVideosUIState.Empty
+                } else {
+                    setBlocks(courseStructure.blockData)
+                    courseSubSections.clear()
+                    courseSubSectionUnit.clear()
+                    courseStructure = courseStructure.copy(blockData = sortBlocks(blocks))
+                    initDownloadModelsStatus()
+
+                    val courseSectionsState =
+                        (_uiState.value as? CourseVideosUIState.CourseData)?.courseSectionsState.orEmpty()
+
+                    _uiState.value =
+                        CourseVideosUIState.CourseData(
+                            courseStructure, getDownloadModelsStatus(), courseSubSections,
+                            courseSectionsState, subSectionsDownloadsCount, getDownloadModelsSize()
+                        )
+                }
+                courseNotifier.send(CourseLoading(false))
+            } catch (e: Exception) {
                 _uiState.value = CourseVideosUIState.Empty
-            } else {
-                setBlocks(courseStructure.blockData)
-                courseSubSections.clear()
-                courseSubSectionUnit.clear()
-                courseStructure = courseStructure.copy(blockData = sortBlocks(blocks))
-                initDownloadModelsStatus()
-
-                val courseSectionsState =
-                    (_uiState.value as? CourseVideosUIState.CourseData)?.courseSectionsState.orEmpty()
-
-                _uiState.value =
-                    CourseVideosUIState.CourseData(
-                        courseStructure, getDownloadModelsStatus(), courseSubSections,
-                        courseSectionsState, subSectionsDownloadsCount, getDownloadModelsSize()
-                    )
             }
-            courseNotifier.send(CourseLoading(false))
         }
     }