mirror of
https://github.com/libre-tube/LibreTube.git
synced 2025-04-28 16:00:31 +05:30
Merge pull request #1318 from Isira-Seneviratne/Kotlin_extensions
Use Kotlin extension functions.
This commit is contained in:
Bnyro
GitHub
commit
24a4a170cc
@ -7,7 +7,8 @@ import android.content.Intent
|
||||
import android.net.Uri
|
||||
import android.os.Build
|
||||
import android.os.Bundle
|
||||
import android.text.Html
|
||||
import androidx.core.text.HtmlCompat
|
||||
import androidx.core.text.parseAsHtml
|
||||
import com.github.libretube.R
|
||||
import com.github.libretube.constants.DONATE_URL
|
||||
import com.github.libretube.constants.GITHUB_URL
|
||||
@ -116,19 +117,10 @@ class AboutActivity : BaseActivity() {
|
||||
}
|
||||
|
||||
private fun showLicense() {
|
||||
val licenseString = assets
|
||||
?.open("gpl3.html")
|
||||
?.bufferedReader()
|
||||
.use {
|
||||
it?.readText()
|
||||
}
|
||||
|
||||
@Suppress("DEPRECATION")
|
||||
val licenseHtml = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
|
||||
Html.fromHtml(licenseString.toString(), 1)
|
||||
} else {
|
||||
Html.fromHtml(licenseString.toString())
|
||||
}
|
||||
val licenseHtml = assets.open("gpl3.html")
|
||||
.bufferedReader()
|
||||
.use { it.readText() }
|
||||
.parseAsHtml(HtmlCompat.FROM_HTML_SEPARATOR_LINE_BREAK_PARAGRAPH)
|
||||
|
||||
MaterialAlertDialogBuilder(this)
|
||||
.setPositiveButton(getString(R.string.okay)) { _, _ -> }
|
||||
|
||||
@ -1,47 +1,33 @@
|
||||
package com.github.libretube.util
|
||||
|
||||
import android.content.Context
|
||||
import android.content.SharedPreferences
|
||||
import android.net.Uri
|
||||
import androidx.core.content.edit
|
||||
import androidx.preference.PreferenceManager
|
||||
import java.io.FileInputStream
|
||||
import java.io.FileOutputStream
|
||||
import java.io.IOException
|
||||
import java.io.ObjectInputStream
|
||||
import java.io.ObjectOutputStream
|
||||
|
||||
/**
|
||||
* Backup and restore the preferences
|
||||
*/
|
||||
class BackupHelper(
|
||||
private val context: Context
|
||||
) {
|
||||
|
||||
class BackupHelper(private val context: Context) {
|
||||
/**
|
||||
* Backup the default shared preferences to a file
|
||||
*/
|
||||
fun backupSharedPreferences(uri: Uri?) {
|
||||
if (uri == null) return
|
||||
var output: ObjectOutputStream? = null
|
||||
try {
|
||||
val fileDescriptor =
|
||||
context.contentResolver.openFileDescriptor(uri, "w")?.fileDescriptor
|
||||
output = ObjectOutputStream(FileOutputStream(fileDescriptor))
|
||||
val pref: SharedPreferences = PreferenceManager.getDefaultSharedPreferences(context)
|
||||
context.contentResolver.openFileDescriptor(uri, "w")?.use {
|
||||
ObjectOutputStream(FileOutputStream(it.fileDescriptor)).use { output ->
|
||||
val pref = PreferenceManager.getDefaultSharedPreferences(context)
|
||||
// write all preference objects to the output file
|
||||
output.writeObject(pref.all)
|
||||
}
|
||||
}
|
||||
} catch (e: Exception) {
|
||||
e.printStackTrace()
|
||||
} finally {
|
||||
try {
|
||||
// close the outputStream
|
||||
if (output != null) {
|
||||
output.flush()
|
||||
output.close()
|
||||
}
|
||||
} catch (ex: IOException) {
|
||||
ex.printStackTrace()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -51,42 +37,31 @@ class BackupHelper(
|
||||
@Suppress("UNCHECKED_CAST")
|
||||
fun restoreSharedPreferences(uri: Uri?) {
|
||||
if (uri == null) return
|
||||
var input: ObjectInputStream? = null
|
||||
try {
|
||||
val fileDescriptor =
|
||||
context.contentResolver.openFileDescriptor(uri, "r")?.fileDescriptor
|
||||
input = ObjectInputStream(FileInputStream(fileDescriptor))
|
||||
val editor = PreferenceManager.getDefaultSharedPreferences(context).edit()
|
||||
|
||||
// clear the previous settings
|
||||
editor.clear()
|
||||
|
||||
context.contentResolver.openFileDescriptor(uri, "r")?.use {
|
||||
ObjectInputStream(FileInputStream(it.fileDescriptor)).use { input ->
|
||||
// map all the preference keys and their values
|
||||
val entries = input.readObject() as Map<String, *>
|
||||
PreferenceManager.getDefaultSharedPreferences(context).edit(commit = true) {
|
||||
// clear the previous settings
|
||||
clear()
|
||||
|
||||
// decide for each preference which type it is and save it to the preferences
|
||||
// decide for each preference which type it is and save it to the
|
||||
// preferences
|
||||
for ((key, value) in entries) {
|
||||
if (value is Boolean) {
|
||||
editor.putBoolean(key, value)
|
||||
} else if (value is Float) {
|
||||
editor.putFloat(key, value)
|
||||
} else if (value is Int) {
|
||||
editor.putInt(key, value)
|
||||
} else if (value is Long) {
|
||||
editor.putLong(key, value)
|
||||
} else if (value is String) editor.putString(key, value)
|
||||
when (value) {
|
||||
is Boolean -> putBoolean(key, value)
|
||||
is Float -> putFloat(key, value)
|
||||
is Int -> putInt(key, value)
|
||||
is Long -> putLong(key, value)
|
||||
is String -> putString(key, value)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
editor.commit()
|
||||
} catch (e: Exception) {
|
||||
e.printStackTrace()
|
||||
} finally {
|
||||
try {
|
||||
if (input != null) {
|
||||
input.close()
|
||||
}
|
||||
} catch (ex: IOException) {
|
||||
ex.printStackTrace()
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -15,49 +15,39 @@ import kotlinx.coroutines.CoroutineScope
|
||||
import kotlinx.coroutines.Dispatchers
|
||||
import kotlinx.coroutines.launch
|
||||
import kotlinx.coroutines.runBlocking
|
||||
import java.io.BufferedReader
|
||||
import java.io.FileOutputStream
|
||||
import java.io.InputStreamReader
|
||||
|
||||
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 {
|
||||
var channels = ArrayList<String>()
|
||||
val fileType = activity.contentResolver.getType(uri)
|
||||
|
||||
if (fileType == "application/json") {
|
||||
val channels = when (activity.contentResolver.getType(uri)) {
|
||||
"application/json" -> {
|
||||
// NewPipe subscriptions format
|
||||
val mapper = ObjectMapper()
|
||||
val json = readRawTextFromUri(uri)
|
||||
val json = activity.contentResolver.openInputStream(uri)?.use {
|
||||
it.bufferedReader().use { reader -> reader.readText() }
|
||||
}.orEmpty()
|
||||
|
||||
val subscriptions = mapper.readValue(json, NewPipeSubscriptions::class.java)
|
||||
channels = subscriptions.subscriptions?.map {
|
||||
it.url?.replace("https://www.youtube.com/channel/", "")!!
|
||||
} as ArrayList<String>
|
||||
} else if (
|
||||
fileType == "text/csv" ||
|
||||
fileType == "text/comma-separated-values"
|
||||
) {
|
||||
subscriptions.subscriptions.orEmpty().map {
|
||||
it.url!!.replace("https://www.youtube.com/channel/", "")
|
||||
}
|
||||
}
|
||||
"text/csv", "text/comma-separated-values" -> {
|
||||
// import subscriptions from Google/YouTube Takeout
|
||||
val inputStream = activity.contentResolver.openInputStream(uri)
|
||||
BufferedReader(InputStreamReader(inputStream)).use { reader ->
|
||||
var line: String? = reader.readLine()
|
||||
while (line != null) {
|
||||
val channelId = line.substringBefore(",")
|
||||
if (channelId.length == 24) channels.add(channelId)
|
||||
line = reader.readLine()
|
||||
activity.contentResolver.openInputStream(uri)?.use {
|
||||
it.bufferedReader().useLines { lines ->
|
||||
lines.map { line -> line.substringBefore(",") }
|
||||
.filter { channelId -> channelId.length == 24 }
|
||||
.toList()
|
||||
}
|
||||
}.orEmpty()
|
||||
}
|
||||
inputStream?.close()
|
||||
} else {
|
||||
throw IllegalArgumentException("Unsupported file type")
|
||||
else -> throw IllegalArgumentException("Unsupported file type")
|
||||
}
|
||||
|
||||
CoroutineScope(Dispatchers.IO).launch {
|
||||
@ -75,20 +65,6 @@ class ImportHelper(
|
||||
}
|
||||
}
|
||||
|
||||
private fun readRawTextFromUri(uri: Uri): String {
|
||||
val stringBuilder = StringBuilder()
|
||||
activity.contentResolver.openInputStream(uri)?.use { inputStream ->
|
||||
BufferedReader(InputStreamReader(inputStream)).use { reader ->
|
||||
var line: String? = reader.readLine()
|
||||
while (line != null) {
|
||||
stringBuilder.append(line)
|
||||
line = reader.readLine()
|
||||
}
|
||||
}
|
||||
}
|
||||
return stringBuilder.toString()
|
||||
}
|
||||
|
||||
/**
|
||||
* write the text to the document
|
||||
*/
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user