GitHub/skyline
2
0
Fork 0
mirror of https://github.com/skyline-emu/skyline.git synced 2024-12-27 00:25:28 +03:00
Code Issues Packages Projects Releases Wiki Activity

Address remaining feedback

Browse Source
This commit is contained in:
PabloG02 2023-05-02 13:51:54 +02:00 committed by Billy Laws
parent 6e68786bd8
commit 35fb874a42
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
app/src/main/java/emu/skyline/AppDialog.kt
View File

@ -134,13 +134,11 @@ class AppDialog : BottomSheetDialogFragment() {
AlertDialog.Builder(requireContext()) AlertDialog.Builder(requireContext())
.setTitle(getString(R.string.delete_save_confirmation_message)) .setTitle(getString(R.string.delete_save_confirmation_message))
.setMessage(getString(R.string.action_irreversible)) .setMessage(getString(R.string.action_irreversible))
.setPositiveButton(getString(R.string.yes)) { dialogInterface, _ -> .setNegativeButton(getString(R.string.no), null)
.setPositiveButton(getString(R.string.yes)) { _, _ ->
File(saveFolderPath).deleteRecursively() File(saveFolderPath).deleteRecursively()
binding.deleteSave.isEnabled = false binding.deleteSave.isEnabled = false
binding.exportSave.isEnabled = false binding.exportSave.isEnabled = false
dialogInterface.dismiss()
}.setNegativeButton(getString(R.string.no)) { dialogInterface, _ ->
dialogInterface.cancel()
}.show() }.show()
} }
@ -188,11 +186,10 @@ class AppDialog : BottomSheetDialogFragment() {
return@forEach return@forEach
val entry = ZipEntry("$zipFileName${(if (file.isDirectory) "/" else "")}") val entry = ZipEntry("$zipFileName${(if (file.isDirectory) "/" else "")}")
zos.putNextEntry(entry) zos.putNextEntry(entry)
if (file.isFile) { if (file.isFile)
file.inputStream().use { fis -> fis.copyTo(zos) } file.inputStream().use { fis -> fis.copyTo(zos) }
} }
} }
}
lastZipCreated = outputZipFile lastZipCreated = outputZipFile
} catch (e : Exception) { } catch (e : Exception) {
return false return false
@ -200,7 +197,7 @@ class AppDialog : BottomSheetDialogFragment() {
return true return true
} }
private val startForResultExportSave = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { _ -> private val startForResultExportSave = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
lastZipCreated?.delete() lastZipCreated?.delete()
} }
@ -210,7 +207,9 @@ class AppDialog : BottomSheetDialogFragment() {
*/ */
private fun exportSave(saveFolderPath : String) { private fun exportSave(saveFolderPath : String) {
CoroutineScope(Dispatchers.IO).launch { CoroutineScope(Dispatchers.IO).launch {
if (!zipSave(saveFolderPath)) { val wasZipCreated = zipSave(saveFolderPath)
val lastZipFile = lastZipCreated
if (!wasZipCreated || lastZipFile == null) {
withContext(Dispatchers.Main) { withContext(Dispatchers.Main) {
Snackbar.make(binding.root, R.string.error, Snackbar.LENGTH_LONG).show() Snackbar.make(binding.root, R.string.error, Snackbar.LENGTH_LONG).show()
} }
@ -218,7 +217,7 @@ class AppDialog : BottomSheetDialogFragment() {
} }
withContext(Dispatchers.Main) { withContext(Dispatchers.Main) {
val file = DocumentFile.fromSingleUri(requireContext(), DocumentsContract.buildDocumentUri(DocumentsProvider.AUTHORITY, "${DocumentsProvider.ROOT_ID}/switch/nand/user/save/0000000000000000/00000000000000000000000000000001/${lastZipCreated!!.name}"))!! val file = DocumentFile.fromSingleUri(requireContext(), DocumentsContract.buildDocumentUri(DocumentsProvider.AUTHORITY, "${DocumentsProvider.ROOT_ID}/switch/nand/user/save/0000000000000000/00000000000000000000000000000001/${lastZipFile.name}"))!!
val intent = Intent(Intent.ACTION_SEND) val intent = Intent(Intent.ACTION_SEND)
.setDataAndType(file.uri, "application/zip") .setDataAndType(file.uri, "application/zip")
.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION) .addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
@ -257,14 +256,14 @@ class AppDialog : BottomSheetDialogFragment() {
} }
withContext(Dispatchers.Main) { withContext(Dispatchers.Main) {
if (validZip) { if (!validZip) {
Snackbar.make(binding.root, getString(R.string.save_file_invalid_zip_structure), Snackbar.LENGTH_LONG).show()
return@withContext
}
val isSaveFileOfThisGame = File("$savesFolderRoot${item.titleId}").exists() val isSaveFileOfThisGame = File("$savesFolderRoot${item.titleId}").exists()
binding.deleteSave.isEnabled = isSaveFileOfThisGame binding.deleteSave.isEnabled = isSaveFileOfThisGame
binding.exportSave.isEnabled = isSaveFileOfThisGame binding.exportSave.isEnabled = isSaveFileOfThisGame
Snackbar.make(binding.root, R.string.save_file_imported_ok, Snackbar.LENGTH_LONG).show() Snackbar.make(binding.root, R.string.save_file_imported_ok, Snackbar.LENGTH_LONG).show()
} else {
Snackbar.make(binding.root, getString(R.string.save_file_invalid_zip_structure), Snackbar.LENGTH_LONG).show()
}
} }
cacheSaveDir.deleteRecursively() cacheSaveDir.deleteRecursively()