sneedmca/Lime3DS
1
0
Fork 0
mirror of https://github.com/Lime3DS/Lime3DS synced 2024-12-23 15:42:39 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "Android: Android 15 URI fixes"

Browse source 
This reverts commit 620abbc8dd.
This commit is contained in:
OpenSauce04 2024-09-25 17:48:53 +01:00 committed by OpenSauce
parent 0a164af12e
commit df60fd91a8
4 changed files with 29 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/android/app/src/main/java/io/github/lime3ds/android/fragments/HomeSettingsFragment.kt
View file

@ -5,7 +5,6 @@
package io.github.lime3ds.android.fragments
import android.content.Intent
import android.net.Uri
import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
@ -160,7 +159,7 @@ class HomeSettingsFragment : Fragment() {
R.string.select_lime3ds_user_folder,
R.string.select_lime3ds_user_folder_home_description,
R.drawable.ic_home,
{ mainActivity?.openLime3DSDirectory?.launch(Uri.parse(null)) },
{ mainActivity?.openLime3DSDirectory?.launch(null) },
details = homeViewModel.userDir
),
HomeSetting(

2
src/android/app/src/main/java/io/github/lime3ds/android/fragments/Lime3DSDirectoryDialogFragment.kt
View file

@ -60,7 +60,7 @@ class Lime3DSDirectoryDialogFragment : DialogFragment() {
}
.setNegativeButton(android.R.string.cancel) { _: DialogInterface?, _: Int ->
if (!PermissionsHandler.hasWriteAccess(requireContext())) {
(requireActivity() as MainActivity)?.openLime3DSDirectory?.launch(Uri.parse(null))
(requireActivity() as MainActivity)?.openLime3DSDirectory?.launch(null)
}
}
.show()

3
src/android/app/src/main/java/io/github/lime3ds/android/fragments/SelectUserDirectoryDialogFragment.kt
View file

@ -6,7 +6,6 @@ package io.github.lime3ds.android.fragments
import android.app.Dialog
import android.content.DialogInterface
import android.net.Uri
import android.os.Bundle
import androidx.fragment.app.DialogFragment
import androidx.fragment.app.FragmentActivity
@ -27,7 +26,7 @@ class SelectUserDirectoryDialogFragment : DialogFragment() {
.setTitle(R.string.select_lime3ds_user_folder)
.setMessage(R.string.cannot_skip_directory_description)
.setPositiveButton(android.R.string.ok) { _: DialogInterface, _: Int ->
mainActivity?.openLime3DSDirectory?.launch(Uri.parse(null))
mainActivity?.openLime3DSDirectory?.launch(null)
}
.show()
}

60
src/android/app/src/main/java/io/github/lime3ds/android/utils/FileUtil.kt
View file

@ -1,4 +1,4 @@
// Copyright Citra Emulator Project / Lime3DS Emulator Project
// Copyright 2023 Citra Emulator Project
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
@ -16,7 +16,6 @@ import io.github.lime3ds.android.LimeApplication
import io.github.lime3ds.android.model.CheapDocument
import java.io.BufferedInputStream
import java.io.File
import java.io.FileNotFoundException
import java.io.FileOutputStream
import java.io.IOException
import java.io.InputStream
@ -101,21 +100,18 @@ object FileUtil {
@JvmStatic
fun openContentUri(path: String, openMode: String): Int {
try {
val uri = Uri.parse(path)
context.contentResolver.openFileDescriptor(uri, openMode)?.use { parcelFileDescriptor ->
return parcelFileDescriptor.detachFd()
} ?: run {
Log.error("[FileUtil]: Cannot get the file descriptor from uri: $path")
return -1
}
} catch (e: FileNotFoundException) {
Log.error("[FileUtil]: File not found for uri: $path. ${e.message}")
return -1
} catch (e: SecurityException) {
Log.error("[FileUtil]: Security exception while accessing uri: $path, ${e.message}")
return -1
context
.contentResolver
.openFileDescriptor(Uri.parse(path), openMode)
.use { parcelFileDescriptor ->
if (parcelFileDescriptor == null) {
Log.error("[FileUtil]: Cannot get the file descriptor from uri: $path")
return -1
}
return parcelFileDescriptor.detachFd()
}
} catch (e: Exception) {
Log.error("[FileUtil]: Unexpected error while opening content uri: $path. ${e.message}")
Log.error("[FileUtil]: Cannot open content uri, error: " + e.message)
return -1
}
}
@ -134,9 +130,8 @@ object FileUtil {
DocumentsContract.Document.COLUMN_DISPLAY_NAME,
DocumentsContract.Document.COLUMN_MIME_TYPE
)
var cursor: Cursor? = null
val results = mutableListOf<CheapDocument>()
var c: Cursor? = null
val results: MutableList<CheapDocument> = ArrayList()
try {
val docId = if (isRootTreeUri(uri)) {
DocumentsContract.getTreeDocumentId(uri)
@ -145,24 +140,21 @@ object FileUtil {
}
val childrenUri = DocumentsContract.buildChildDocumentsUriUsingTree(uri, docId)
cursor = context.contentResolver.query(childrenUri, columns, null, null, null)
cursor?.use { c ->
while (c.moveToNext()) {
val documentId = c.getString(c.getColumnIndexOrThrow(DocumentsContract.Document.COLUMN_DOCUMENT_ID))
val documentName = c.getString(c.getColumnIndexOrThrow(DocumentsContract.Document.COLUMN_DISPLAY_NAME))
val documentMimeType = c.getString(c.getColumnIndexOrThrow(DocumentsContract.Document.COLUMN_MIME_TYPE))
val documentUri = DocumentsContract.buildDocumentUriUsingTree(uri, documentId)
val document = CheapDocument(documentName, documentMimeType, documentUri)
results.add(document)
}
} ?: run {
Log.error("[FileUtil]: Cursor is null")
c = context.contentResolver.query(childrenUri, columns, null, null, null)
while (c!!.moveToNext()) {
val documentId = c.getString(0)
val documentName = c.getString(1)
val documentMimeType = c.getString(2)
val documentUri = DocumentsContract.buildDocumentUriUsingTree(uri, documentId)
val document = CheapDocument(documentName, documentMimeType, documentUri)
results.add(document)
}
} catch (e: Exception) {
Log.error("[FileUtil]: Cannot list files: ${e.message}")
Log.error("[FileUtil]: Cannot list file error: " + e.message)
} finally {
closeQuietly(c)
}
return results.toTypedArray()
return results.toTypedArray<CheapDocument>()
}
/**