kavin/LibreTube
1
0
Fork 0
mirror of https://github.com/libre-tube/LibreTube.git synced 2025-01-07 18:10:31 +05:30
Code Issues Projects Releases Wiki Activity

Merge pull request #2930 from Isira-Seneviratne/Remove_String_all

Browse Source 
Remove uses of String.all().
This commit is contained in:
Bnyro 2023-02-01 18:06:49 +01:00 committed by GitHub
commit 43d5e8ce3b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/java/com/github/libretube/api/PlaylistsHelper.kt
View File

@ -2,6 +2,7 @@ package com.github.libretube.api
import android.content.Context import android.content.Context
import android.util.Log import android.util.Log
import androidx.core.text.isDigitsOnly
import com.github.libretube.R import com.github.libretube.R
import com.github.libretube.api.obj.Playlist import com.github.libretube.api.obj.Playlist
import com.github.libretube.api.obj.PlaylistId import com.github.libretube.api.obj.PlaylistId
@ -237,8 +238,12 @@ object PlaylistsHelper {
} }
private fun getPrivatePlaylistType(playlistId: String): PlaylistType { private fun getPrivatePlaylistType(playlistId: String): PlaylistType {
if (playlistId.all { it.isDigit() }) return PlaylistType.LOCAL return if (playlistId.isDigitsOnly()) {
if (playlistId.matches(pipedPlaylistRegex)) return PlaylistType.PRIVATE PlaylistType.LOCAL
return PlaylistType.PUBLIC } else if (playlistId.matches(pipedPlaylistRegex)) {
PlaylistType.PRIVATE
} else {
PlaylistType.PUBLIC
}
} }
} }

6
app/src/main/java/com/github/libretube/util/TextUtils.kt
View File

@ -41,11 +41,7 @@ object TextUtils {
* @return Time in seconds * @return Time in seconds
*/ */
fun parseTimestamp(t: String): Long? { fun parseTimestamp(t: String): Long? {
if (t.all { c -> c.isDigit() }) { return t.toLongOrNull() ?: Duration.parseOrNull(t)?.inWholeSeconds
return t.toLong()
}
return Duration.parseOrNull(t)?.inWholeSeconds
} }
/** /**