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

Merge pull request #2296 from Bnyro/master

Browse Source 
allow `application/*` as import file type
This commit is contained in:
Bnyro 2022-12-08 17:42:42 +01:00 committed by GitHub
commit 1c6730ab7c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/com/github/libretube/util/ImportHelper.kt
View File

@ -40,7 +40,7 @@ class ImportHelper(
Log.e(TAG(), e.toString()) Log.e(TAG(), e.toString())
activity.toastFromMainThread( activity.toastFromMainThread(
activity.getString(R.string.unsupported_file_format) + activity.getString(R.string.unsupported_file_format) +
" (${activity.contentResolver.getType(uri)}" " (${activity.contentResolver.getType(uri)})"
) )
} catch (e: Exception) { } catch (e: Exception) {
Log.e(TAG(), e.toString()) Log.e(TAG(), e.toString())
@ -53,7 +53,7 @@ class ImportHelper(
*/ */
private fun getChannelsFromUri(uri: Uri): List<String> { private fun getChannelsFromUri(uri: Uri): List<String> {
return when (val fileType = activity.contentResolver.getType(uri)) { return when (val fileType = activity.contentResolver.getType(uri)) {
"application/json", "application/octet-stream" -> { "application/json", "application/*", "application/octet-stream" -> {
// NewPipe subscriptions format // NewPipe subscriptions format
val subscriptions = ObjectMapper().readValue(uri.readText(), NewPipeSubscriptions::class.java) val subscriptions = ObjectMapper().readValue(uri.readText(), NewPipeSubscriptions::class.java)
subscriptions.subscriptions.orEmpty().map { subscriptions.subscriptions.orEmpty().map {