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

Merge pull request #2912 from Isira-Seneviratne/takeWhile

Browse Source 
Use Kotlin's takeWhile() extension.
This commit is contained in:
Bnyro 2023-01-30 15:08:21 +01:00 committed by GitHub
commit 3e6fb49bf4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/src/main/java/com/github/libretube/extensions/FilterUntil.kt
View File

@ -1,15 +0,0 @@
package com.github.libretube.extensions
/**
* Returns a list of all items until the given condition is fulfilled
* @param predicate The condition which needs to be searched for
* @return a list of all items before the first true condition
*/
fun <T> List<T>.filterUntil(predicate: (T) -> Boolean): List<T>? {
val items = mutableListOf<T>()
this.forEach {
if (predicate(it)) return items
items.add(it)
}
return null
}

5
app/src/main/java/com/github/libretube/workers/NotificationWorker.kt
View File

@ -18,7 +18,6 @@ import com.github.libretube.constants.IntentData
import com.github.libretube.constants.PUSH_CHANNEL_ID import com.github.libretube.constants.PUSH_CHANNEL_ID
import com.github.libretube.constants.PreferenceKeys import com.github.libretube.constants.PreferenceKeys
import com.github.libretube.extensions.TAG import com.github.libretube.extensions.TAG
import com.github.libretube.extensions.filterUntil
import com.github.libretube.extensions.toID import com.github.libretube.extensions.toID
import com.github.libretube.ui.activities.MainActivity import com.github.libretube.ui.activities.MainActivity
import com.github.libretube.ui.views.TimePickerPreference import com.github.libretube.ui.views.TimePickerPreference
@ -107,9 +106,7 @@ class NotificationWorker(appContext: Context, parameters: WorkerParameters) :
} }
// filter the new videos until the last seen video in the feed // filter the new videos until the last seen video in the feed
val newStreams = videoFeed.filterUntil { val newStreams = videoFeed.takeWhile { it.url!!.toID() != lastSeenStreamId }
it.url!!.toID() == lastSeenStreamId
} ?: return@runBlocking
// return if the previous video didn't get found // return if the previous video didn't get found
if (newStreams.isEmpty()) return@runBlocking if (newStreams.isEmpty()) return@runBlocking