kavin/LibreTube
1
0
Fork 0
mirror of https://github.com/libre-tube/LibreTube.git synced 2025-04-28 16:00:31 +05:30
Code Issues Projects Releases Wiki Activity

Filter out null comments returned from Piped API. (#3061)

Browse Source 
* Made improvement to player double-tap further.

* Minor fixes.

* fix ktlint

* Filter out null comments returned from Piped API.
This commit is contained in:
Faisal Khan 2023-02-13 22:38:56 +05:30 committed by GitHub
parent 582ab70bd1
commit 6053eae99b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/com/github/libretube/ui/extensions/FilterNonEmptyComments.kt Normal file
View File

@ -0,0 +1,7 @@
package com.github.libretube.ui.extensions
import com.github.libretube.api.obj.Comment
fun List<Comment>.filterNonEmptyComments(): List<Comment> {
return filter { !it.commentText.isNullOrEmpty() }
}

2
app/src/main/java/com/github/libretube/ui/fragments/CommentsRepliesFragment.kt
View File

@ -17,6 +17,7 @@ import com.github.libretube.constants.IntentData
import com.github.libretube.databinding.FragmentCommentsBinding import com.github.libretube.databinding.FragmentCommentsBinding
import com.github.libretube.extensions.TAG import com.github.libretube.extensions.TAG
import com.github.libretube.ui.adapters.CommentsAdapter import com.github.libretube.ui.adapters.CommentsAdapter
import com.github.libretube.ui.extensions.filterNonEmptyComments
import com.github.libretube.ui.models.CommentsViewModel import com.github.libretube.ui.models.CommentsViewModel
import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
@ -97,6 +98,7 @@ class CommentsRepliesFragment : Fragment() {
Log.e(TAG(), "IOException, you might not have internet connection") Log.e(TAG(), "IOException, you might not have internet connection")
return@launch return@launch
} }
repliesPage.comments = repliesPage.comments.filterNonEmptyComments()
withContext(Dispatchers.Main) { withContext(Dispatchers.Main) {
onFinished.invoke(repliesPage) onFinished.invoke(repliesPage)
} }

4
app/src/main/java/com/github/libretube/ui/models/CommentsViewModel.kt
View File

@ -6,6 +6,7 @@ import androidx.lifecycle.ViewModel
import com.github.libretube.api.RetrofitInstance import com.github.libretube.api.RetrofitInstance
import com.github.libretube.api.obj.CommentsPage import com.github.libretube.api.obj.CommentsPage
import com.github.libretube.extensions.TAG import com.github.libretube.extensions.TAG
import com.github.libretube.ui.extensions.filterNonEmptyComments
import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
@ -33,6 +34,7 @@ class CommentsViewModel : ViewModel() {
return@launch return@launch
} }
nextPage = response.nextpage nextPage = response.nextpage
response.comments = response.comments.filterNonEmptyComments()
commentsPage.postValue(response) commentsPage.postValue(response)
isLoading = false isLoading = false
} }
@ -49,7 +51,7 @@ class CommentsViewModel : ViewModel() {
return@launch return@launch
} }
val updatedPage = commentsPage.value?.apply { val updatedPage = commentsPage.value?.apply {
comments += response.comments comments += response.comments.filterNonEmptyComments()
} }
nextPage = response.nextpage nextPage = response.nextpage
commentsPage.postValue(updatedPage) commentsPage.postValue(updatedPage)