mirror of
https://github.com/libre-tube/LibreTube.git
synced 2024-12-14 22:30:30 +05:30
Merge pull request #2296 from Bnyro/master
allow `application/*` as import file type
This commit is contained in:
commit
1c6730ab7c
@ -40,7 +40,7 @@ class ImportHelper(
|
||||
Log.e(TAG(), e.toString())
|
||||
activity.toastFromMainThread(
|
||||
activity.getString(R.string.unsupported_file_format) +
|
||||
" (${activity.contentResolver.getType(uri)}"
|
||||
" (${activity.contentResolver.getType(uri)})"
|
||||
)
|
||||
} catch (e: Exception) {
|
||||
Log.e(TAG(), e.toString())
|
||||
@ -53,7 +53,7 @@ class ImportHelper(
|
||||
*/
|
||||
private fun getChannelsFromUri(uri: Uri): List<String> {
|
||||
return when (val fileType = activity.contentResolver.getType(uri)) {
|
||||
"application/json", "application/octet-stream" -> {
|
||||
"application/json", "application/*", "application/octet-stream" -> {
|
||||
// NewPipe subscriptions format
|
||||
val subscriptions = ObjectMapper().readValue(uri.readText(), NewPipeSubscriptions::class.java)
|
||||
subscriptions.subscriptions.orEmpty().map {
|
||||
|
Loading…
Reference in New Issue
Block a user