sneedmca/Lime3DS
1
0
Fork 0
mirror of https://github.com/Lime3DS/Lime3DS synced 2024-10-29 19:27:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Android: Android 15 URI fixes

Browse source
This commit is contained in:
Jarrod Norwell 2024-09-15 14:46:43 -06:00 committed by OpenSauce04
parent 73774333da
commit 620abbc8dd
5 changed files with 40 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/android/app/build.gradle.kts
View file

@ -160,6 +160,7 @@ android {
jniLibs.srcDir(downloadedJniLibsPath)
}
}
buildToolsVersion = "35.0.0"
}
dependencies {

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

@ -5,6 +5,7 @@
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
@ -159,7 +160,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(null) },
{ mainActivity?.openLime3DSDirectory?.launch(Uri.parse(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(null)
(requireActivity() as MainActivity)?.openLime3DSDirectory?.launch(Uri.parse(null))
}
}
.show()

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

@ -6,6 +6,7 @@ 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
@ -26,7 +27,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(null)
mainActivity?.openLime3DSDirectory?.launch(Uri.parse(null))
}
.show()
}

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

@ -1,4 +1,4 @@
// Copyright 2023 Citra Emulator Project
// Copyright Citra Emulator Project / Lime3DS Emulator Project
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
@ -16,6 +16,7 @@ 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
@ -100,18 +101,21 @@ object FileUtil {
@JvmStatic
fun openContentUri(path: String, openMode: String): Int {
try {
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()
}
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
} catch (e: Exception) {
Log.error("[FileUtil]: Cannot open content uri, error: " + e.message)
Log.error("[FileUtil]: Unexpected error while opening content uri: $path. ${e.message}")
return -1
}
}
@ -130,8 +134,9 @@ object FileUtil {
DocumentsContract.Document.COLUMN_DISPLAY_NAME,
DocumentsContract.Document.COLUMN_MIME_TYPE
)
var c: Cursor? = null
val results: MutableList<CheapDocument> = ArrayList()
var cursor: Cursor? = null
val results = mutableListOf<CheapDocument>()
try {
val docId = if (isRootTreeUri(uri)) {
DocumentsContract.getTreeDocumentId(uri)
@ -140,21 +145,24 @@ object FileUtil {
}
val childrenUri = DocumentsContract.buildChildDocumentsUriUsingTree(uri, docId)
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)
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")
}
} catch (e: Exception) {
Log.error("[FileUtil]: Cannot list file error: " + e.message)
} finally {
closeQuietly(c)
Log.error("[FileUtil]: Cannot list files: ${e.message}")
}
return results.toTypedArray<CheapDocument>()
return results.toTypedArray()
}
/**