VERY experimental Nintendo Switch 2 emulator
C++
android: Support intents to emulation activity
Charles Lombardo99ae57c433cc
diff --git a/src/android/app/src/main/AndroidManifest.xml b/src/android/app/src/main/AndroidManifest.xmlindex 9332441403..832c08e153 100644--- a/src/android/app/src/main/AndroidManifest.xml+++ b/src/android/app/src/main/AndroidManifest.xml@@ -66,6 +66,14 @@ SPDX-License-Identifier: GPL-3.0-or-later<data android:mimeType="application/octet-stream" /></intent-filter>+ <intent-filter>+ <action android:name="android.intent.action.VIEW" />+ <category android:name="android.intent.category.DEFAULT" />+ <data+ android:mimeType="application/octet-stream"+ android:scheme="content"/>+ </intent-filter>+<meta-dataandroid:name="android.nfc.action.TECH_DISCOVERED"android:resource="@xml/nfc_tech_filter" />diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/EmulationFragment.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/EmulationFragment.ktindex 09e93a017e..956c35c0a8 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/EmulationFragment.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/EmulationFragment.kt@@ -11,6 +11,7 @@ import android.content.SharedPreferencesimport android.content.pm.ActivityInfoimport android.content.res.Configurationimport android.graphics.Color+import android.net.Uriimport android.os.Bundleimport android.os.Handlerimport android.os.Looper@@ -47,6 +48,7 @@ import org.yuzu.yuzu_emu.features.settings.model.IntSettingimport org.yuzu.yuzu_emu.features.settings.model.Settingsimport org.yuzu.yuzu_emu.features.settings.ui.SettingsActivityimport org.yuzu.yuzu_emu.features.settings.utils.SettingsFile+import org.yuzu.yuzu_emu.model.Gameimport org.yuzu.yuzu_emu.overlay.InputOverlayimport org.yuzu.yuzu_emu.utils.*@@ -59,7 +61,9 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {private var _binding: FragmentEmulationBinding? = nullprivate val binding get() = _binding!!- val args by navArgs<EmulationFragmentArgs>()+ private val args by navArgs<EmulationFragmentArgs>()++ private lateinit var game: Gameprivate var isInFoldableLayout = false@@ -87,10 +91,25 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {override fun onCreate(savedInstanceState: Bundle?) {super.onCreate(savedInstanceState)+ val intentUri: Uri? = requireActivity().intent.data+ var intentGame: Game? = null+ if (intentUri != null) {+ intentGame = if (Game.extensions.contains(FileUtil.getExtension(intentUri))) {+ GameHelper.getGame(requireActivity().intent.data!!, false)+ } else {+ null+ }+ }+ game = if (args.game != null) {+ args.game!!+ } else {+ intentGame ?: error("[EmulationFragment] No bootable game present!")+ }+// So this fragment doesn't restart on configuration changes; i.e. rotation.retainInstance = truepreferences = PreferenceManager.getDefaultSharedPreferences(YuzuApplication.appContext)- emulationState = EmulationState(args.game.path)+ emulationState = EmulationState(game.path)}/**@@ -114,7 +133,7 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {updateShowFpsOverlay()binding.inGameMenu.getHeaderView(0).findViewById<TextView>(R.id.text_game_title).text =- args.game.title+ game.titlebinding.inGameMenu.setNavigationItemSelectedListener {when (it.itemId) {R.id.menu_pause_emulation -> {diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/GameHelper.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/GameHelper.ktindex f71d0a098c..e0ee29c9ba 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/GameHelper.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/GameHelper.kt@@ -63,13 +63,13 @@ object GameHelper {)} else {if (Game.extensions.contains(FileUtil.getExtension(it.uri))) {- games.add(getGame(it.uri))+ games.add(getGame(it.uri, true))}}}}- private fun getGame(uri: Uri): Game {+ fun getGame(uri: Uri, addedToLibrary: Boolean): Game {val filePath = uri.toString()var name = NativeLibrary.getTitle(filePath)@@ -94,11 +94,13 @@ object GameHelper {NativeLibrary.isHomebrew(filePath))- val addedTime = preferences.getLong(newGame.keyAddedToLibraryTime, 0L)- if (addedTime == 0L) {- preferences.edit()- .putLong(newGame.keyAddedToLibraryTime, System.currentTimeMillis())- .apply()+ if (addedToLibrary) {+ val addedTime = preferences.getLong(newGame.keyAddedToLibraryTime, 0L)+ if (addedTime == 0L) {+ preferences.edit()+ .putLong(newGame.keyAddedToLibraryTime, System.currentTimeMillis())+ .apply()+ }}return newGamediff --git a/src/android/app/src/main/res/navigation/emulation_navigation.xml b/src/android/app/src/main/res/navigation/emulation_navigation.xmlindex 8208f4c2c4..cd1d36a12a 100644--- a/src/android/app/src/main/res/navigation/emulation_navigation.xml+++ b/src/android/app/src/main/res/navigation/emulation_navigation.xml@@ -12,7 +12,9 @@tools:layout="@layout/fragment_emulation" ><argumentandroid:name="game"- app:argType="org.yuzu.yuzu_emu.model.Game" />+ app:argType="org.yuzu.yuzu_emu.model.Game"+ app:nullable="true"+ android:defaultValue="@null" /></fragment></navigation>diff --git a/src/android/app/src/main/res/navigation/home_navigation.xml b/src/android/app/src/main/res/navigation/home_navigation.xmlindex fcebba7266..42f987fed4 100644--- a/src/android/app/src/main/res/navigation/home_navigation.xml+++ b/src/android/app/src/main/res/navigation/home_navigation.xml@@ -62,7 +62,9 @@android:label="EmulationActivity"><argumentandroid:name="game"- app:argType="org.yuzu.yuzu_emu.model.Game" />+ app:argType="org.yuzu.yuzu_emu.model.Game"+ app:nullable="true"+ android:defaultValue="@null" /></activity><action