Merge pull request #13448 from TeamNewPipe/comment-crash

fix app crash on loading comment section with no internet

Author: theimpulson

app/src/main/java/org/schabi/newpipe/paging/CommentsSource.kt

@@ -20,11 +20,14 @@ class CommentsSource(private val commentInfo: CommentInfo) : PagingSource<Page,
         if (params.key == null) {
             return LoadResult.Page(commentInfo.comments, null, commentInfo.nextPage)
         } else {
-            val info = withContext(Dispatchers.IO) {
-                CommentsInfo.getMoreItems(service, commentInfo.url, params.key)
+            return try {
+                val info = withContext(Dispatchers.IO) {
+                    CommentsInfo.getMoreItems(service, commentInfo.url, params.key)
+                }
+                LoadResult.Page(info.items, null, info.nextPage)
+            } catch (exception: Exception) {
+                LoadResult.Error(exception)
             }
-
-            return LoadResult.Page(info.items, null, info.nextPage)
         }
     }
 

app/src/main/java/org/schabi/newpipe/ui/components/video/comment/CommentSection.kt

@@ -139,6 +139,37 @@ private fun CommentSection(
                                 items(comments.itemCount) {
                                     Comment(comment = comments[it]!!) {}
                                 }
+
+                                // handle append (next page) errors
+                                when (comments.loadState.append) {
+                                    is LoadState.Error -> {
+                                        item {
+                                            ErrorPanel(
+                                                errorInfo = ErrorInfo(
+                                                    throwable = (comments.loadState.append as LoadState.Error).error,
+                                                    userAction = UserAction.REQUESTED_COMMENTS,
+                                                    request = "comments"
+                                                ),
+                                                onRetry = { comments.retry() },
+                                                modifier = Modifier.fillMaxWidth()
+                                            )
+                                        }
+                                    }
+
+                                    // show loading indicator while appending
+                                    is LoadState.Loading -> {
+                                        item {
+                                            LoadingIndicator(
+                                                modifier = Modifier.padding(
+                                                    top = 8.dp,
+                                                    bottom = 8.dp
+                                                )
+                                            )
+                                        }
+                                    }
+
+                                    else -> {}
+                                }
                             }
                         }
                     }