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

Merge pull request #1868 from Bnyro/master

Browse Source 
Improved user feedback on subscription import
This commit is contained in:
Bnyro 2022-11-16 16:54:49 +01:00 committed by GitHub
commit 068214df85
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 45 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,6 +9,7 @@ import com.github.libretube.R
import com.github.libretube.api.RetrofitInstance
import com.github.libretube.api.SubscriptionHelper
import com.github.libretube.extensions.TAG
import com.github.libretube.extensions.toastFromMainThread
import com.github.libretube.obj.NewPipeSubscription
import com.github.libretube.obj.NewPipeSubscriptions
import kotlinx.coroutines.CoroutineScope
@ -17,14 +18,36 @@ import kotlinx.coroutines.launch
import kotlinx.coroutines.runBlocking
import java.io.FileOutputStream
class ImportHelper(private val activity: Activity) {
class ImportHelper(
private val activity: Activity
) {
/**
* Import subscriptions by a file uri
*/
fun importSubscriptions(uri: Uri?) {
if (uri == null) return
try {
val channels = when (activity.contentResolver.getType(uri)) {
val applicationContext = activity.applicationContext
val channels = getChannelsFromUri(uri)
CoroutineScope(Dispatchers.IO).launch {
SubscriptionHelper.importSubscriptions(channels)
}.invokeOnCompletion {
applicationContext.toastFromMainThread(R.string.importsuccess)
}
} catch (e: IllegalArgumentException) {
Log.e(TAG(), e.toString())
Toast.makeText(activity, R.string.unsupported_file_format, Toast.LENGTH_SHORT).show()
} catch (e: Exception) {
Log.e(TAG(), e.toString())
Toast.makeText(activity, R.string.server_error, Toast.LENGTH_SHORT).show()
}
}
/**
* Get a list of channel IDs from a file [Uri]
*/
private fun getChannelsFromUri(uri: Uri): List<String> {
return when (activity.contentResolver.getType(uri)) {
"application/json" -> {
// NewPipe subscriptions format
val mapper = ObjectMapper()
@ -49,24 +72,10 @@ class ImportHelper(private val activity: Activity) {
}
else -> throw IllegalArgumentException("Unsupported file type")
}
CoroutineScope(Dispatchers.IO).launch {
SubscriptionHelper.importSubscriptions(channels)
}
Toast.makeText(activity, R.string.importsuccess, Toast.LENGTH_SHORT).show()
} catch (e: Exception) {
Log.e(TAG(), e.toString())
Toast.makeText(
activity,
R.string.error,
Toast.LENGTH_SHORT
).show()
}
}
/**
* write the text to the document
* Write the text to the document
*/
fun exportSubscriptions(uri: Uri?) {
if (uri == null) return

1
app/src/main/res/values/strings.xml
View File

@ -372,6 +372,7 @@
<string name="alternative_player_layout_summary">Show the related videos as a row above the comments instead of below.</string>
<string name="audio_track">Audio track</string>
<string name="default_audio_track">Default</string>
<string name="unsupported_file_format">Unsupported file format!</string>
<!-- Notification channel strings -->
<string name="download_channel_name">Download Service</string>