beenull/ViMusic
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Drop document contracts intent check because of false positives

Browse source
This commit is contained in:
vfsfitvnm 2022-10-07 17:11:16 +02:00
parent 21dec9cd05
commit d758d2142d
1 changed files with 33 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/settings/DatabaseSettings.kt
View file

@ -1,7 +1,6 @@
package it.vfsfitvnm.vimusic.ui.screens.settings
import android.annotation.SuppressLint
import android.widget.Toast
import androidx.activity.compose.rememberLauncherForActivityResult
import androidx.activity.result.contract.ActivityResultContracts
import androidx.compose.animation.ExperimentalAnimationApi
@ -49,16 +48,15 @@ fun DatabaseSettings() {
.collect { value = it }
}
val openDocumentContract = ActivityResultContracts.OpenDocument()
val createDocumentContract = ActivityResultContracts.CreateDocument("application/vnd.sqlite3")
val backupLauncher = rememberLauncherForActivityResult(createDocumentContract) { uri ->
val backupLauncher =
rememberLauncherForActivityResult(ActivityResultContracts.CreateDocument("application/vnd.sqlite3")) { uri ->
if (uri == null) return@rememberLauncherForActivityResult
query {
Database.internal.checkpoint()
context.applicationContext.contentResolver.openOutputStream(uri)?.use { outputStream ->
context.applicationContext.contentResolver.openOutputStream(uri)
?.use { outputStream ->
FileInputStream(Database.internal.path).use { inputStream ->
inputStream.copyTo(outputStream)
}
@ -66,14 +64,16 @@ fun DatabaseSettings() {
}
}
val restoreLauncher = rememberLauncherForActivityResult(openDocumentContract) { uri ->
val restoreLauncher =
rememberLauncherForActivityResult(ActivityResultContracts.OpenDocument()) { uri ->
if (uri == null) return@rememberLauncherForActivityResult
query {
Database.internal.checkpoint()
Database.internal.close()
context.applicationContext.contentResolver.openInputStream(uri)?.use { inputStream ->
context.applicationContext.contentResolver.openInputStream(uri)
?.use { inputStream ->
FileOutputStream(Database.internal.path).use { outputStream ->
inputStream.copyTo(outputStream)
}
@ -123,21 +123,7 @@ fun DatabaseSettings() {
onClick = {
@SuppressLint("SimpleDateFormat")
val dateFormat = SimpleDateFormat("yyyyMMddHHmmss")
val input = "vimusic_${dateFormat.format(Date())}.db"
if (createDocumentContract.createIntent(context, input)
.resolveActivity(context.packageManager) != null
) {
backupLauncher.launch(input)
} else {
Toast
.makeText(
context,
"Can't copy the database to the external storage",
Toast.LENGTH_SHORT
)
.show()
}
backupLauncher.launch("vimusic_${dateFormat.format(Date())}.db")
}
)
@ -151,23 +137,13 @@ fun DatabaseSettings() {
title = "Restore",
text = "Import the database from the external storage",
onClick = {
val input = arrayOf(
restoreLauncher.launch(
arrayOf(
"application/x-sqlite3",
"application/vnd.sqlite3",
"application/octet-stream"
)
if (openDocumentContract.createIntent(context, input)
.resolveActivity(context.packageManager) != null
) {
restoreLauncher.launch(input)
} else {
Toast.makeText(
context,
"Can't read the database from the external storage",
Toast.LENGTH_SHORT
).show()
}
)
}
)
}