MirrorRepos/azahar
1
0
Fork 0
mirror of https://github.com/azahar-emu/azahar.git synced 2026-06-05 18:23:39 -04:00
Code Issues Projects Releases Packages Wiki Activity

android: Fixed installed app shortcut creation failing on vanilla

Browse source
This commit is contained in:
OpenSauce04 2026-03-14 19:21:54 +00:00 • committed by OpenSauce
parent 0ff2aebdf1
commit d97da17263
3 changed files with 34 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/android/app/src/main/java/org/citra/citra_emu/NativeLibrary.kt
View file

@ -729,6 +729,10 @@ object NativeLibrary {
return uriString
}
if (uri.scheme == "file") {
return uri.path!!
}
val pathSegment = uri.lastPathSegment ?: return ""
val virtualPath = pathSegment.substringAfter(":")

28
src/android/app/src/main/java/org/citra/citra_emu/model/Game.kt
View file

@ -7,11 +7,16 @@ package org.citra.citra_emu.model
import android.os.Parcelable
import android.content.Intent
import android.net.Uri
import androidx.core.net.toUri
import java.io.File
import java.io.IOException
import java.util.HashSet
import kotlinx.parcelize.Parcelize
import kotlinx.serialization.Serializable
import org.citra.citra_emu.CitraApplication
import org.citra.citra_emu.NativeLibrary
import org.citra.citra_emu.activities.EmulationActivity
import org.citra.citra_emu.utils.BuildUtil
@Parcelize
@Serializable
@ -37,12 +42,25 @@ class Game(
val keyLastPlayedTime get() = "${filename}_LastPlayed"
val launchIntent: Intent
get() = Intent(CitraApplication.appContext, EmulationActivity::class.java).apply {
action = Intent.ACTION_VIEW
data = if (isInstalled) {
CitraApplication.documentsTree.getUri(path)
get() {
var appUri: Uri
if (isInstalled) {
if (BuildUtil.isGooglePlayBuild) {
appUri = CitraApplication.documentsTree.getUri(path)
} else {
val nativePath = NativeLibrary.getUserDirectory() + "/" + path
val nativeFile = File(nativePath)
if (!nativeFile.exists()) {
throw IOException("Attempting to create shortcut for an executable that doesn't exist: $nativePath")
}
appUri = Uri.fromFile(nativeFile)
}
} else {
Uri.parse(path)
appUri = path.toUri()
}
return Intent(CitraApplication.appContext, EmulationActivity::class.java).apply {
action = Intent.ACTION_VIEW
data = appUri
}
}

8
src/android/app/src/main/java/org/citra/citra_emu/utils/FileUtil.kt
View file

@ -219,10 +219,16 @@ object FileUtil {
*/
@JvmStatic
fun getFilename(uri: Uri): String {
val columns = arrayOf(DocumentsContract.Document.COLUMN_DISPLAY_NAME)
var filename = ""
var c: Cursor? = null
try {
if (uri.scheme == "file") {
BuildUtil.assertNotGooglePlay()
val file = File(uri.path!!);
return file.name
}
val columns = arrayOf(DocumentsContract.Document.COLUMN_DISPLAY_NAME)
c = context.contentResolver.query(
uri,
columns,