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

Merge pull request #1889 from Bnyro/master

Browse Source 
allow unknown file types for importing subscriptions
This commit is contained in:
Bnyro 2022-11-17 19:05:12 +01:00 committed by GitHub
commit c804044582
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

@ -44,7 +44,7 @@ class ImportHelper(
).show() ).show()
} catch (e: Exception) { } catch (e: Exception) {
Log.e(TAG(), e.toString()) Log.e(TAG(), e.toString())
Toast.makeText(activity, R.string.server_error, Toast.LENGTH_SHORT).show() Toast.makeText(activity, e.localizedMessage, Toast.LENGTH_SHORT).show()
} }
} }
@ -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/json", "application/octet-stream" -> {
// NewPipe subscriptions format // NewPipe subscriptions format
val mapper = ObjectMapper() val mapper = ObjectMapper()
val json = activity.contentResolver.openInputStream(uri)?.use { val json = activity.contentResolver.openInputStream(uri)?.use {