early-access version 3899

2023-09-27 20:05:05 +02:00 · 2023-09-27 20:05:05 +02:00 · d79f95b191
commit d79f95b191
parent 42de14aabe
35 changed files with 681 additions and 217 deletions
--- a/README.md
+++ b/README.md
@ -1,7 +1,7 @@
 yuzu emulator early access
 =============

-This is the source code for early-access 3897.
+This is the source code for early-access 3899.

 ## Legal Notice

--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/NativeLibrary.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/NativeLibrary.kt
@ -247,7 +247,12 @@ object NativeLibrary {

    external fun setAppDirectory(directory: String)

-    external fun installFileToNand(filename: String): Int
+    /**
+     * Installs a nsp or xci file to nand
+     * @param filename String representation of file uri
+     * @param extension Lowercase string representation of file extension without "."
+     */
+    external fun installFileToNand(filename: String, extension: String): Int

    external fun initializeGpuDriver(
        hookLibDir: String?,
@ -511,6 +516,11 @@ object NativeLibrary {
     */
    external fun submitInlineKeyboardInput(key_code: Int)

+    /**
+     * Creates a generic user directory if it doesn't exist already
+     */
+    external fun initializeEmptyUserDirectory()
+
    /**
     * Button type for use in onTouchEvent
     */
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/adapters/InstallableAdapter.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/adapters/InstallableAdapter.kt
@ -0,0 +1,49 @@
+// SPDX-FileCopyrightText: 2023 yuzu Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+package org.yuzu.yuzu_emu.adapters
+
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
+import org.yuzu.yuzu_emu.databinding.CardInstallableBinding
+import org.yuzu.yuzu_emu.model.Installable
+
+class InstallableAdapter(private val installables: List<Installable>) :
+    RecyclerView.Adapter<InstallableAdapter.InstallableViewHolder>() {
+    override fun onCreateViewHolder(
+        parent: ViewGroup,
+        viewType: Int
+    ): InstallableAdapter.InstallableViewHolder {
+        val binding =
+            CardInstallableBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+        return InstallableViewHolder(binding)
+    }
+
+    override fun getItemCount(): Int = installables.size
+
+    override fun onBindViewHolder(holder: InstallableAdapter.InstallableViewHolder, position: Int) =
+        holder.bind(installables[position])
+
+    inner class InstallableViewHolder(val binding: CardInstallableBinding) :
+        RecyclerView.ViewHolder(binding.root) {
+        lateinit var installable: Installable
+
+        fun bind(installable: Installable) {
+            this.installable = installable
+
+            binding.title.setText(installable.titleId)
+            binding.description.setText(installable.descriptionId)
+
+            if (installable.install != null) {
+                binding.buttonInstall.visibility = View.VISIBLE
+                binding.buttonInstall.setOnClickListener { installable.install.invoke() }
+            }
+            if (installable.export != null) {
+                binding.buttonExport.visibility = View.VISIBLE
+                binding.buttonExport.setOnClickListener { installable.export.invoke() }
+            }
+        }
+    }
+}
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsActivity.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsActivity.kt
@ -21,6 +21,7 @@ import androidx.navigation.navArgs
 import com.google.android.material.color.MaterialColors
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.launch
+import org.yuzu.yuzu_emu.NativeLibrary
 import java.io.IOException
 import org.yuzu.yuzu_emu.R
 import org.yuzu.yuzu_emu.databinding.ActivitySettingsBinding
@ -168,7 +169,7 @@ class SettingsActivity : AppCompatActivity() {
        if (!settingsFile.delete()) {
            throw IOException("Failed to delete $settingsFile")
        }
-        Settings.settingsList.forEach { it.reset() }
+        NativeLibrary.reloadSettings()

        Toast.makeText(
            applicationContext,
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/AboutFragment.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/AboutFragment.kt
@ -26,7 +26,6 @@ import org.yuzu.yuzu_emu.BuildConfig
 import org.yuzu.yuzu_emu.R
 import org.yuzu.yuzu_emu.databinding.FragmentAboutBinding
 import org.yuzu.yuzu_emu.model.HomeViewModel
-import org.yuzu.yuzu_emu.ui.main.MainActivity

 class AboutFragment : Fragment() {
    private var _binding: FragmentAboutBinding? = null
@ -93,12 +92,6 @@ class AboutFragment : Fragment() {
            }
        }

-        val mainActivity = requireActivity() as MainActivity
-        binding.buttonExport.setOnClickListener { mainActivity.exportUserData.launch("export.zip") }
-        binding.buttonImport.setOnClickListener {
-            mainActivity.importUserData.launch(arrayOf("application/zip"))
-        }
-
        binding.buttonDiscord.setOnClickListener { openLink(getString(R.string.support_link)) }
        binding.buttonWebsite.setOnClickListener { openLink(getString(R.string.website_link)) }
        binding.buttonGithub.setOnClickListener { openLink(getString(R.string.github_link)) }
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/HomeSettingsFragment.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/HomeSettingsFragment.kt
@ -118,18 +118,13 @@ class HomeSettingsFragment : Fragment() {
            )
            add(
                HomeSetting(
-                    R.string.install_amiibo_keys,
-                    R.string.install_amiibo_keys_description,
-                    R.drawable.ic_nfc,
-                    { mainActivity.getAmiiboKey.launch(arrayOf("*/*")) }
-                )
-            )
-            add(
-                HomeSetting(
-                    R.string.install_game_content,
-                    R.string.install_game_content_description,
-                    R.drawable.ic_system_update_alt,
-                    { mainActivity.installGameUpdate.launch(arrayOf("*/*")) }
+                    R.string.manage_yuzu_data,
+                    R.string.manage_yuzu_data_description,
+                    R.drawable.ic_install,
+                    {
+                        binding.root.findNavController()
+                            .navigate(R.id.action_homeSettingsFragment_to_installableFragment)
+                    }
                )
            )
            add(
@ -148,35 +143,6 @@ class HomeSettingsFragment : Fragment() {
                    homeViewModel.gamesDir
                )
            )
-            add(
-                HomeSetting(
-                    R.string.manage_save_data,
-                    R.string.import_export_saves_description,
-                    R.drawable.ic_save,
-                    {
-                        ImportExportSavesFragment().show(
-                            parentFragmentManager,
-                            ImportExportSavesFragment.TAG
-                        )
-                    }
-                )
-            )
-            add(
-                HomeSetting(
-                    R.string.install_prod_keys,
-                    R.string.install_prod_keys_description,
-                    R.drawable.ic_unlock,
-                    { mainActivity.getProdKey.launch(arrayOf("*/*")) }
-                )
-            )
-            add(
-                HomeSetting(
-                    R.string.install_firmware,
-                    R.string.install_firmware_description,
-                    R.drawable.ic_firmware,
-                    { mainActivity.getFirmware.launch(arrayOf("application/zip")) }
-                )
-            )
            add(
                HomeSetting(
                    R.string.share_log,
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/IndeterminateProgressDialogFragment.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/IndeterminateProgressDialogFragment.kt
@ -4,12 +4,12 @@
 package org.yuzu.yuzu_emu.fragments

 import android.app.Dialog
-import android.content.DialogInterface
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.Toast
+import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.activityViewModels
@ -39,9 +39,7 @@ class IndeterminateProgressDialogFragment : DialogFragment() {
            .setView(binding.root)

        if (cancellable) {
-            dialog.setNegativeButton(android.R.string.cancel) { _: DialogInterface, _: Int ->
-                taskViewModel.setCancelled(true)
-            }
+            dialog.setNegativeButton(android.R.string.cancel, null)
        }

        val alertDialog = dialog.create()
@ -98,6 +96,18 @@ class IndeterminateProgressDialogFragment : DialogFragment() {
        }
    }

+    // By default, the ProgressDialog will immediately dismiss itself upon a button being pressed.
+    // Setting the OnClickListener again after the dialog is shown overrides this behavior.
+    override fun onResume() {
+        super.onResume()
+        val alertDialog = dialog as AlertDialog
+        val negativeButton = alertDialog.getButton(Dialog.BUTTON_NEGATIVE)
+        negativeButton.setOnClickListener {
+            alertDialog.setTitle(getString(R.string.cancelling))
+            taskViewModel.setCancelled(true)
+        }
+    }
+
    companion object {
        const val TAG = "IndeterminateProgressDialogFragment"

--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/InstallableFragment.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/InstallableFragment.kt
@ -0,0 +1,138 @@
+// SPDX-FileCopyrightText: 2023 yuzu Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+package org.yuzu.yuzu_emu.fragments
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.updatePadding
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.activityViewModels
+import androidx.navigation.findNavController
+import androidx.recyclerview.widget.GridLayoutManager
+import com.google.android.material.transition.MaterialSharedAxis
+import org.yuzu.yuzu_emu.R
+import org.yuzu.yuzu_emu.adapters.InstallableAdapter
+import org.yuzu.yuzu_emu.databinding.FragmentInstallablesBinding
+import org.yuzu.yuzu_emu.model.HomeViewModel
+import org.yuzu.yuzu_emu.model.Installable
+import org.yuzu.yuzu_emu.ui.main.MainActivity
+
+class InstallableFragment : Fragment() {
+    private var _binding: FragmentInstallablesBinding? = null
+    private val binding get() = _binding!!
+
+    private val homeViewModel: HomeViewModel by activityViewModels()
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        enterTransition = MaterialSharedAxis(MaterialSharedAxis.X, true)
+        returnTransition = MaterialSharedAxis(MaterialSharedAxis.X, false)
+        reenterTransition = MaterialSharedAxis(MaterialSharedAxis.X, false)
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        _binding = FragmentInstallablesBinding.inflate(layoutInflater)
+        return binding.root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        val mainActivity = requireActivity() as MainActivity
+
+        homeViewModel.setNavigationVisibility(visible = false, animated = true)
+        homeViewModel.setStatusBarShadeVisibility(visible = false)
+
+        binding.toolbarInstallables.setNavigationOnClickListener {
+            binding.root.findNavController().popBackStack()
+        }
+
+        val installables = listOf(
+            Installable(
+                R.string.user_data,
+                R.string.user_data_description,
+                install = { mainActivity.importUserData.launch(arrayOf("application/zip")) },
+                export = { mainActivity.exportUserData.launch("export.zip") }
+            ),
+            Installable(
+                R.string.install_game_content,
+                R.string.install_game_content_description,
+                install = { mainActivity.installGameUpdate.launch(arrayOf("*/*")) }
+            ),
+            Installable(
+                R.string.install_firmware,
+                R.string.install_firmware_description,
+                install = { mainActivity.getFirmware.launch(arrayOf("application/zip")) }
+            ),
+            if (mainActivity.savesFolderRoot != "") {
+                Installable(
+                    R.string.manage_save_data,
+                    R.string.import_export_saves_description,
+                    install = { mainActivity.importSaves.launch(arrayOf("application/zip")) },
+                    export = { mainActivity.exportSave() }
+                )
+            } else {
+                Installable(
+                    R.string.manage_save_data,
+                    R.string.import_export_saves_description,
+                    install = { mainActivity.importSaves.launch(arrayOf("application/zip")) }
+                )
+            },
+            Installable(
+                R.string.install_prod_keys,
+                R.string.install_prod_keys_description,
+                install = { mainActivity.getProdKey.launch(arrayOf("*/*")) }
+            ),
+            Installable(
+                R.string.install_amiibo_keys,
+                R.string.install_amiibo_keys_description,
+                install = { mainActivity.getAmiiboKey.launch(arrayOf("*/*")) }
+            )
+        )
+
+        binding.listInstallables.apply {
+            layoutManager = GridLayoutManager(
+                requireContext(),
+                resources.getInteger(R.integer.grid_columns)
+            )
+            adapter = InstallableAdapter(installables)
+        }
+
+        setInsets()
+    }
+
+    private fun setInsets() =
+        ViewCompat.setOnApplyWindowInsetsListener(
+            binding.root
+        ) { _: View, windowInsets: WindowInsetsCompat ->
+            val barInsets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars())
+            val cutoutInsets = windowInsets.getInsets(WindowInsetsCompat.Type.displayCutout())
+
+            val leftInsets = barInsets.left + cutoutInsets.left
+            val rightInsets = barInsets.right + cutoutInsets.right
+
+            val mlpAppBar = binding.toolbarInstallables.layoutParams as ViewGroup.MarginLayoutParams
+            mlpAppBar.leftMargin = leftInsets
+            mlpAppBar.rightMargin = rightInsets
+            binding.toolbarInstallables.layoutParams = mlpAppBar
+
+            val mlpScrollAbout =
+                binding.listInstallables.layoutParams as ViewGroup.MarginLayoutParams
+            mlpScrollAbout.leftMargin = leftInsets
+            mlpScrollAbout.rightMargin = rightInsets
+            binding.listInstallables.layoutParams = mlpScrollAbout
+
+            binding.listInstallables.updatePadding(bottom = barInsets.bottom)
+
+            windowInsets
+        }
+}
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/model/Installable.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/model/Installable.kt
@ -0,0 +1,13 @@
+// SPDX-FileCopyrightText: 2023 yuzu Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+package org.yuzu.yuzu_emu.model
+
+import androidx.annotation.StringRes
+
+data class Installable(
+    @StringRes val titleId: Int,
+    @StringRes val descriptionId: Int,
+    val install: (() -> Unit)? = null,
+    val export: (() -> Unit)? = null
+)
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/model/TaskViewModel.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/model/TaskViewModel.kt
@ -50,3 +50,9 @@ class TaskViewModel : ViewModel() {
        }
    }
 }
+
+enum class TaskState {
+    Completed,
+    Failed,
+    Cancelled
+}
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/ui/main/MainActivity.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/ui/main/MainActivity.kt
@ -6,6 +6,7 @@ package org.yuzu.yuzu_emu.ui.main
 import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
+import android.provider.DocumentsContract
 import android.view.View
 import android.view.ViewGroup.MarginLayoutParams
 import android.view.WindowManager
@ -19,6 +20,7 @@ import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowCompat
 import androidx.core.view.WindowInsetsCompat
+import androidx.documentfile.provider.DocumentFile
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.repeatOnLifecycle
@ -29,6 +31,7 @@ import androidx.preference.PreferenceManager
 import com.google.android.material.color.MaterialColors
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.navigation.NavigationBarView
+import kotlinx.coroutines.CoroutineScope
 import java.io.File
 import java.io.FilenameFilter
 import java.io.IOException
@ -41,20 +44,23 @@ import org.yuzu.yuzu_emu.R
 import org.yuzu.yuzu_emu.activities.EmulationActivity
 import org.yuzu.yuzu_emu.databinding.ActivityMainBinding
 import org.yuzu.yuzu_emu.databinding.DialogProgressBarBinding
+import org.yuzu.yuzu_emu.features.DocumentProvider
 import org.yuzu.yuzu_emu.features.settings.model.Settings
 import org.yuzu.yuzu_emu.fragments.IndeterminateProgressDialogFragment
 import org.yuzu.yuzu_emu.fragments.MessageDialogFragment
+import org.yuzu.yuzu_emu.getPublicFilesDir
 import org.yuzu.yuzu_emu.model.GamesViewModel
 import org.yuzu.yuzu_emu.model.HomeViewModel
+import org.yuzu.yuzu_emu.model.TaskState
 import org.yuzu.yuzu_emu.model.TaskViewModel
 import org.yuzu.yuzu_emu.utils.*
 import java.io.BufferedInputStream
 import java.io.BufferedOutputStream
-import java.io.FileInputStream
 import java.io.FileOutputStream
+import java.time.LocalDateTime
+import java.time.format.DateTimeFormatter
 import java.util.zip.ZipEntry
 import java.util.zip.ZipInputStream
-import java.util.zip.ZipOutputStream

 class MainActivity : AppCompatActivity(), ThemeProvider {
    private lateinit var binding: ActivityMainBinding
@ -65,6 +71,13 @@ class MainActivity : AppCompatActivity(), ThemeProvider {

    override var themeId: Int = 0

+    private val savesFolder
+        get() = "${getPublicFilesDir().canonicalPath}/nand/user/save/0000000000000000"
+
+    // Get first subfolder in saves folder (should be the user folder)
+    val savesFolderRoot get() = File(savesFolder).listFiles()?.firstOrNull()?.canonicalPath ?: ""
+    private var lastZipCreated: File? = null
+
    override fun onCreate(savedInstanceState: Bundle?) {
        val splashScreen = installSplashScreen()
        splashScreen.setKeepOnScreenCondition { !DirectoryInitialization.areDirectoriesReady }
@ -382,7 +395,7 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
            val task: () -> Any = {
                var messageToShow: Any
                try {
-                    FileUtil.unzip(inputZip, cacheFirmwareDir)
+                    FileUtil.unzipToInternalStorage(BufferedInputStream(inputZip), cacheFirmwareDir)
                    val unfilteredNumOfFiles = cacheFirmwareDir.list()?.size ?: -1
                    val filteredNumOfFiles = cacheFirmwareDir.list(filterNCA)?.size ?: -2
                    messageToShow = if (unfilteredNumOfFiles != filteredNumOfFiles) {
@ -515,7 +528,7 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
        if (documents.isNotEmpty()) {
            IndeterminateProgressDialogFragment.newInstance(
                this@MainActivity,
-                R.string.install_game_content
+                R.string.installing_game_content
            ) {
                var installSuccess = 0
                var installOverwrite = 0
@ -523,7 +536,12 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
                var errorExtension = 0
                var errorOther = 0
                documents.forEach {
-                    when (NativeLibrary.installFileToNand(it.toString())) {
+                    when (
+                        NativeLibrary.installFileToNand(
+                            it.toString(),
+                            FileUtil.getExtension(it)
+                        )
+                    ) {
                        NativeLibrary.InstallFileToNandResult.Success -> {
                            installSuccess += 1
                        }
@ -625,35 +643,17 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
            R.string.exporting_user_data,
            true
        ) {
-            val zos = ZipOutputStream(
-                BufferedOutputStream(contentResolver.openOutputStream(result))
+            val zipResult = FileUtil.zipFromInternalStorage(
+                File(DirectoryInitialization.userDirectory!!),
+                DirectoryInitialization.userDirectory!!,
+                BufferedOutputStream(contentResolver.openOutputStream(result)),
+                taskViewModel.cancelled
            )
-            zos.use { stream ->
-                File(DirectoryInitialization.userDirectory!!).walkTopDown().forEach { file ->
-                    if (taskViewModel.cancelled.value) {
-                        return@newInstance R.string.user_data_export_cancelled
+            return@newInstance when (zipResult) {
+                TaskState.Completed -> getString(R.string.user_data_export_success)
+                TaskState.Failed -> R.string.export_failed
+                TaskState.Cancelled -> R.string.user_data_export_cancelled
            }
-
-                    if (!file.isDirectory) {
-                        val newPath = file.path.substring(
-                            DirectoryInitialization.userDirectory!!.length,
-                            file.path.length
-                        )
-                        stream.putNextEntry(ZipEntry(newPath))
-
-                        val buffer = ByteArray(8096)
-                        var read: Int
-                        FileInputStream(file).use { fis ->
-                            while (fis.read(buffer).also { read = it } != -1) {
-                                stream.write(buffer, 0, read)
-                            }
-                        }
-
-                        stream.closeEntry()
-                    }
-                }
-            }
-            return@newInstance getString(R.string.user_data_export_success)
        }.show(supportFragmentManager, IndeterminateProgressDialogFragment.TAG)
    }

@ -681,43 +681,28 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
                    }
                }
                if (!isYuzuBackup) {
-                    return@newInstance getString(R.string.invalid_yuzu_backup)
-                }
-
-                File(DirectoryInitialization.userDirectory!!).deleteRecursively()
-
-                val zis =
-                    ZipInputStream(BufferedInputStream(contentResolver.openInputStream(result)))
-                val userDirectory = File(DirectoryInitialization.userDirectory!!)
-                val canonicalPath = userDirectory.canonicalPath + '/'
-                zis.use { stream ->
-                    var ze: ZipEntry? = stream.nextEntry
-                    while (ze != null) {
-                        val newFile = File(userDirectory, ze!!.name)
-                        val destinationDirectory =
-                            if (ze!!.isDirectory) newFile else newFile.parentFile
-
-                        if (!newFile.canonicalPath.startsWith(canonicalPath)) {
-                            throw SecurityException(
-                                "Zip file attempted path traversal! ${ze!!.name}"
+                    return@newInstance MessageDialogFragment.newInstance(
+                        this,
+                        titleId = R.string.invalid_yuzu_backup,
+                        descriptionId = R.string.user_data_import_failed_description
                    )
                }

-                        if (!destinationDirectory.isDirectory && !destinationDirectory.mkdirs()) {
-                            throw IOException("Failed to create directory $destinationDirectory")
-                        }
+                // Clear existing user data
+                File(DirectoryInitialization.userDirectory!!).deleteRecursively()

-                        if (!ze!!.isDirectory) {
-                            val buffer = ByteArray(8096)
-                            var read: Int
-                            BufferedOutputStream(FileOutputStream(newFile)).use { bos ->
-                                while (zis.read(buffer).also { read = it } != -1) {
-                                    bos.write(buffer, 0, read)
-                                }
-                            }
-                        }
-                        ze = stream.nextEntry
-                    }
+                // Copy archive to internal storage
+                try {
+                    FileUtil.unzipToInternalStorage(
+                        BufferedInputStream(contentResolver.openInputStream(result)),
+                        File(DirectoryInitialization.userDirectory!!)
+                    )
+                } catch (e: Exception) {
+                    return@newInstance MessageDialogFragment.newInstance(
+                        this,
+                        titleId = R.string.import_failed,
+                        descriptionId = R.string.user_data_import_failed_description
+                    )
                }

                // Reinitialize relevant data
@ -727,4 +712,146 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
                return@newInstance getString(R.string.user_data_import_success)
            }.show(supportFragmentManager, IndeterminateProgressDialogFragment.TAG)
        }
+
+    /**
+     * Zips the save files located in the given folder path and creates a new zip file with the current date and time.
+     * @return true if the zip file is successfully created, false otherwise.
+     */
+    private fun zipSave(): Boolean {
+        try {
+            val tempFolder = File(getPublicFilesDir().canonicalPath, "temp")
+            tempFolder.mkdirs()
+            val saveFolder = File(savesFolderRoot)
+            val outputZipFile = File(
+                tempFolder,
+                "yuzu saves - ${
+                LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm"))
+                }.zip"
+            )
+            outputZipFile.createNewFile()
+            val result = FileUtil.zipFromInternalStorage(
+                saveFolder,
+                savesFolderRoot,
+                BufferedOutputStream(FileOutputStream(outputZipFile))
+            )
+            if (result == TaskState.Failed) {
+                return false
+            }
+            lastZipCreated = outputZipFile
+        } catch (e: Exception) {
+            return false
+        }
+        return true
+    }
+
+    /**
+     * Exports the save file located in the given folder path by creating a zip file and sharing it via intent.
+     */
+    fun exportSave() {
+        CoroutineScope(Dispatchers.IO).launch {
+            val wasZipCreated = zipSave()
+            val lastZipFile = lastZipCreated
+            if (!wasZipCreated || lastZipFile == null) {
+                withContext(Dispatchers.Main) {
+                    Toast.makeText(
+                        this@MainActivity,
+                        getString(R.string.export_save_failed),
+                        Toast.LENGTH_LONG
+                    ).show()
+                }
+                return@launch
+            }
+
+            withContext(Dispatchers.Main) {
+                val file = DocumentFile.fromSingleUri(
+                    this@MainActivity,
+                    DocumentsContract.buildDocumentUri(
+                        DocumentProvider.AUTHORITY,
+                        "${DocumentProvider.ROOT_ID}/temp/${lastZipFile.name}"
+                    )
+                )!!
+                val intent = Intent(Intent.ACTION_SEND)
+                    .setDataAndType(file.uri, "application/zip")
+                    .addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
+                    .putExtra(Intent.EXTRA_STREAM, file.uri)
+                startForResultExportSave.launch(
+                    Intent.createChooser(
+                        intent,
+                        getString(R.string.share_save_file)
+                    )
+                )
+            }
+        }
+    }
+
+    private val startForResultExportSave =
+        registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { _ ->
+            File(getPublicFilesDir().canonicalPath, "temp").deleteRecursively()
+        }
+
+    val importSaves =
+        registerForActivityResult(ActivityResultContracts.OpenDocument()) { result ->
+            if (result == null) {
+                return@registerForActivityResult
+            }
+
+            NativeLibrary.initializeEmptyUserDirectory()
+
+            val inputZip = contentResolver.openInputStream(result)
+            // A zip needs to have at least one subfolder named after a TitleId in order to be considered valid.
+            var validZip = false
+            val savesFolder = File(savesFolderRoot)
+            val cacheSaveDir = File("${applicationContext.cacheDir.path}/saves/")
+            cacheSaveDir.mkdir()
+
+            if (inputZip == null) {
+                Toast.makeText(
+                    applicationContext,
+                    getString(R.string.fatal_error),
+                    Toast.LENGTH_LONG
+                ).show()
+                return@registerForActivityResult
+            }
+
+            val filterTitleId =
+                FilenameFilter { _, dirName -> dirName.matches(Regex("^0100[\\dA-Fa-f]{12}$")) }
+
+            try {
+                CoroutineScope(Dispatchers.IO).launch {
+                    FileUtil.unzipToInternalStorage(BufferedInputStream(inputZip), cacheSaveDir)
+                    cacheSaveDir.list(filterTitleId)?.forEach { savePath ->
+                        File(savesFolder, savePath).deleteRecursively()
+                        File(cacheSaveDir, savePath).copyRecursively(
+                            File(savesFolder, savePath),
+                            true
+                        )
+                        validZip = true
+                    }
+
+                    withContext(Dispatchers.Main) {
+                        if (!validZip) {
+                            MessageDialogFragment.newInstance(
+                                this@MainActivity,
+                                titleId = R.string.save_file_invalid_zip_structure,
+                                descriptionId = R.string.save_file_invalid_zip_structure_description
+                            ).show(supportFragmentManager, MessageDialogFragment.TAG)
+                            return@withContext
+                        }
+                        Toast.makeText(
+                            applicationContext,
+                            getString(R.string.save_file_imported_success),
+                            Toast.LENGTH_LONG
+                        ).show()
+                    }
+
+                    cacheSaveDir.deleteRecursively()
+                }
+            } catch (e: Exception) {
+                Toast.makeText(
+                    applicationContext,
+                    getString(R.string.fatal_error),
+                    Toast.LENGTH_LONG
+                ).show()
+            }
+        }
 }
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/FileUtil.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/FileUtil.kt
@ -8,6 +8,7 @@ import android.database.Cursor
 import android.net.Uri
 import android.provider.DocumentsContract
 import androidx.documentfile.provider.DocumentFile
+import kotlinx.coroutines.flow.StateFlow
 import java.io.BufferedInputStream
 import java.io.File
 import java.io.FileOutputStream
@ -18,6 +19,9 @@ import java.util.zip.ZipEntry
 import java.util.zip.ZipInputStream
 import org.yuzu.yuzu_emu.YuzuApplication
 import org.yuzu.yuzu_emu.model.MinimalDocumentFile
+import org.yuzu.yuzu_emu.model.TaskState
+import java.io.BufferedOutputStream
+import java.util.zip.ZipOutputStream

 object FileUtil {
    const val PATH_TREE = "tree"
@ -282,30 +286,65 @@ object FileUtil {

    /**
     * Extracts the given zip file into the given directory.
-     * @exception IOException if the file was being created outside of the target directory
     */
    @Throws(SecurityException::class)
-    fun unzip(zipStream: InputStream, destDir: File): Boolean {
-        ZipInputStream(BufferedInputStream(zipStream)).use { zis ->
+    fun unzipToInternalStorage(zipStream: BufferedInputStream, destDir: File) {
+        ZipInputStream(zipStream).use { zis ->
            var entry: ZipEntry? = zis.nextEntry
            while (entry != null) {
-                val entryName = entry.name
-                val entryFile = File(destDir, entryName)
-                if (!entryFile.canonicalPath.startsWith(destDir.canonicalPath + File.separator)) {
-                    throw SecurityException("Entry is outside of the target dir: " + entryFile.name)
+                val newFile = File(destDir, entry.name)
+                val destinationDirectory = if (entry.isDirectory) newFile else newFile.parentFile
+
+                if (!newFile.canonicalPath.startsWith(destDir.canonicalPath + File.separator)) {
+                    throw SecurityException("Zip file attempted path traversal! ${entry.name}")
                }
-                if (entry.isDirectory) {
-                    entryFile.mkdirs()
-                } else {
-                    entryFile.parentFile?.mkdirs()
-                    entryFile.createNewFile()
-                    entryFile.outputStream().use { fos -> zis.copyTo(fos) }
+
+                if (!destinationDirectory.isDirectory && !destinationDirectory.mkdirs()) {
+                    throw IOException("Failed to create directory $destinationDirectory")
+                }
+
+                if (!entry.isDirectory) {
+                    newFile.outputStream().use { fos -> zis.copyTo(fos) }
                }
                entry = zis.nextEntry
            }
        }
+    }

-        return true
+    /**
+     * Creates a zip file from a directory within internal storage
+     * @param inputFile File representation of the item that will be zipped
+     * @param rootDir Directory containing the inputFile
+     * @param outputStream Stream where the zip file will be output
+     */
+    fun zipFromInternalStorage(
+        inputFile: File,
+        rootDir: String,
+        outputStream: BufferedOutputStream,
+        cancelled: StateFlow<Boolean>? = null
+    ): TaskState {
+        try {
+            ZipOutputStream(outputStream).use { zos ->
+                inputFile.walkTopDown().forEach { file ->
+                    if (cancelled?.value == true) {
+                        return TaskState.Cancelled
+                    }
+
+                    if (!file.isDirectory) {
+                        val entryName =
+                            file.absolutePath.removePrefix(rootDir).removePrefix("/")
+                        val entry = ZipEntry(entryName)
+                        zos.putNextEntry(entry)
+                        if (file.isFile) {
+                            file.inputStream().use { fis -> fis.copyTo(zos) }
+                        }
+                    }
+                }
+            }
+        } catch (e: Exception) {
+            return TaskState.Failed
+        }
+        return TaskState.Completed
    }

    fun isRootTreeUri(uri: Uri): Boolean {
--- a/src/android/app/src/main/jni/native.cpp
+++ b/src/android/app/src/main/jni/native.cpp
@ -13,6 +13,8 @@

 #include <android/api-level.h>
 #include <android/native_window_jni.h>
+#include <common/fs/fs.h>
+#include <core/file_sys/savedata_factory.h>
 #include <core/loader/nro.h>
 #include <jni.h>

@ -102,7 +104,7 @@ public:
        m_native_window = native_window;
    }

-    int InstallFileToNand(std::string filename) {
+    int InstallFileToNand(std::string filename, std::string file_extension) {
        jconst copy_func = [](const FileSys::VirtualFile& src, const FileSys::VirtualFile& dest,
                              std::size_t block_size) {
            if (src == nullptr || dest == nullptr) {
@ -134,12 +136,12 @@ public:
        m_system.GetFileSystemController().CreateFactories(*m_vfs);

        [[maybe_unused]] std::shared_ptr<FileSys::NSP> nsp;
-        if (filename.ends_with("nsp")) {
+        if (file_extension == "nsp") {
            nsp = std::make_shared<FileSys::NSP>(m_vfs->OpenFile(filename, FileSys::Mode::Read));
            if (nsp->IsExtractedType()) {
                return InstallError;
            }
-        } else if (filename.ends_with("xci")) {
+        } else if (file_extension == "xci") {
            jconst xci =
                std::make_shared<FileSys::XCI>(m_vfs->OpenFile(filename, FileSys::Mode::Read));
            nsp = xci->GetSecurePartitionNSP();
@ -607,8 +609,10 @@ void Java_org_yuzu_yuzu_1emu_NativeLibrary_setAppDirectory(JNIEnv* env, jobject
 }

 int Java_org_yuzu_yuzu_1emu_NativeLibrary_installFileToNand(JNIEnv* env, jobject instance,
-                                                            [[maybe_unused]] jstring j_file) {
-    return EmulationSession::GetInstance().InstallFileToNand(GetJString(env, j_file));
+                                                            jstring j_file,
+                                                            jstring j_file_extension) {
+    return EmulationSession::GetInstance().InstallFileToNand(GetJString(env, j_file),
+                                                             GetJString(env, j_file_extension));
 }

 void JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_initializeGpuDriver(JNIEnv* env, jclass clazz,
@ -879,4 +883,24 @@ void Java_org_yuzu_yuzu_1emu_NativeLibrary_submitInlineKeyboardInput(JNIEnv* env
    EmulationSession::GetInstance().SoftwareKeyboard()->SubmitInlineKeyboardInput(j_key_code);
 }

+void Java_org_yuzu_yuzu_1emu_NativeLibrary_initializeEmptyUserDirectory(JNIEnv* env,
+                                                                        jobject instance) {
+    const auto nand_dir = Common::FS::GetYuzuPath(Common::FS::YuzuPath::NANDDir);
+    auto vfs_nand_dir = EmulationSession::GetInstance().System().GetFilesystem()->OpenDirectory(
+        Common::FS::PathToUTF8String(nand_dir), FileSys::Mode::Read);
+
+    Service::Account::ProfileManager manager;
+    const auto user_id = manager.GetUser(static_cast<std::size_t>(0));
+    ASSERT(user_id);
+
+    const auto user_save_data_path = FileSys::SaveDataFactory::GetFullPath(
+        EmulationSession::GetInstance().System(), vfs_nand_dir, FileSys::SaveDataSpaceId::NandUser,
+        FileSys::SaveDataType::SaveData, 1, user_id->AsU128(), 0);
+
+    const auto full_path = Common::FS::ConcatPathSafe(nand_dir, user_save_data_path);
+    if (!Common::FS::CreateParentDirs(full_path)) {
+        LOG_WARNING(Frontend, "Failed to create full path of the default user's save directory");
+    }
+}
+
 } // extern "C"
--- a/src/android/app/src/main/res/layout/card_installable.xml
+++ b/src/android/app/src/main/res/layout/card_installable.xml
@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    style="?attr/materialCardViewOutlinedStyle"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginHorizontal="16dp"
+    android:layout_marginVertical="12dp">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="16dp"
+        android:orientation="horizontal"
+        android:layout_gravity="center">
+
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="16dp"
+            android:layout_weight="1"
+            android:orientation="vertical">
+
+            <com.google.android.material.textview.MaterialTextView
+                android:id="@+id/title"
+                style="@style/TextAppearance.Material3.TitleMedium"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/user_data"
+                android:textAlignment="viewStart" />
+
+            <com.google.android.material.textview.MaterialTextView
+                android:id="@+id/description"
+                style="@style/TextAppearance.Material3.BodyMedium"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="6dp"
+                android:text="@string/user_data_description"
+                android:textAlignment="viewStart" />
+
+        </LinearLayout>
+
+        <Button
+            android:id="@+id/button_export"
+            style="@style/Widget.Material3.Button.IconButton.Filled.Tonal"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:contentDescription="@string/export"
+            android:tooltipText="@string/export"
+            android:visibility="gone"
+            app:icon="@drawable/ic_export"
+            tools:visibility="visible" />
+
+        <Button
+            android:id="@+id/button_install"
+            style="@style/Widget.Material3.Button.IconButton.Filled.Tonal"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_marginStart="12dp"
+            android:contentDescription="@string/string_import"
+            android:tooltipText="@string/string_import"
+            android:visibility="gone"
+            app:icon="@drawable/ic_import"
+            tools:visibility="visible" />
+
+    </LinearLayout>
+
+</com.google.android.material.card.MaterialCardView>
--- a/src/android/app/src/main/res/layout/fragment_about.xml
+++ b/src/android/app/src/main/res/layout/fragment_about.xml
@ -176,67 +176,6 @@

            </LinearLayout>

-            <com.google.android.material.divider.MaterialDivider
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginHorizontal="20dp" />
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal">
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:paddingVertical="16dp"
-                    android:paddingHorizontal="16dp"
-                    android:orientation="vertical"
-                    android:layout_weight="1">
-
-                    <com.google.android.material.textview.MaterialTextView
-                        style="@style/TextAppearance.Material3.TitleMedium"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginHorizontal="24dp"
-                        android:textAlignment="viewStart"
-                        android:text="@string/user_data" />
-
-                    <com.google.android.material.textview.MaterialTextView
-                        style="@style/TextAppearance.Material3.BodyMedium"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginHorizontal="24dp"
-                        android:layout_marginTop="6dp"
-                        android:textAlignment="viewStart"
-                        android:text="@string/user_data_description" />
-
-                </LinearLayout>
-
-                <Button
-                    android:id="@+id/button_import"
-                    style="@style/Widget.Material3.Button.IconButton.Filled.Tonal"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:contentDescription="@string/string_import"
-                    android:tooltipText="@string/string_import"
-                    app:icon="@drawable/ic_import" />
-
-                <Button
-                    android:id="@+id/button_export"
-                    style="@style/Widget.Material3.Button.IconButton.Filled.Tonal"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="12dp"
-                    android:layout_marginEnd="24dp"
-                    android:layout_gravity="center_vertical"
-                    android:contentDescription="@string/export"
-                    android:tooltipText="@string/export"
-                    app:icon="@drawable/ic_export" />
-
-            </LinearLayout>
-
            <com.google.android.material.divider.MaterialDivider
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
--- a/src/android/app/src/main/res/layout/fragment_installables.xml
+++ b/src/android/app/src/main/res/layout/fragment_installables.xml
@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/coordinator_licenses"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="?attr/colorSurface">
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/appbar_installables"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:fitsSystemWindows="true">
+
+        <com.google.android.material.appbar.MaterialToolbar
+            android:id="@+id/toolbar_installables"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            app:title="@string/manage_yuzu_data"
+            app:navigationIcon="@drawable/ic_back" />
+
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/list_installables"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:clipToPadding="false"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior" />
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
--- a/src/android/app/src/main/res/navigation/home_navigation.xml
+++ b/src/android/app/src/main/res/navigation/home_navigation.xml
@ -19,6 +19,9 @@
        <action
            android:id="@+id/action_homeSettingsFragment_to_earlyAccessFragment"
            app:destination="@id/earlyAccessFragment" />
+        <action
+            android:id="@+id/action_homeSettingsFragment_to_installableFragment"
+            app:destination="@id/installableFragment" />
    </fragment>

    <fragment
@ -88,5 +91,9 @@
    <action
        android:id="@+id/action_global_settingsActivity"
        app:destination="@id/settingsActivity" />
+    <fragment
+        android:id="@+id/installableFragment"
+        android:name="org.yuzu.yuzu_emu.fragments.InstallableFragment"
+        android:label="InstallableFragment" />

 </navigation>
--- a/src/android/app/src/main/res/values-de/strings.xml
+++ b/src/android/app/src/main/res/values-de/strings.xml
@ -79,7 +79,6 @@
    <string name="manage_save_data">Speicherdaten verwalten</string>
    <string name="manage_save_data_description">Speicherdaten gefunden. Bitte wähle unten eine Option aus.</string>
    <string name="import_export_saves_description">Speicherdaten importieren oder exportieren</string>
-    <string name="import_export_saves_no_profile">Keine Speicherdaten gefunden. Bitte starte ein Spiel und versuche es erneut.</string>
    <string name="save_file_imported_success">Erfolgreich importiert</string>
    <string name="save_file_invalid_zip_structure">Ungültige Speicherverzeichnisstruktur</string>
    <string name="save_file_invalid_zip_structure_description">Der erste Unterordnername muss die Titel-ID des Spiels sein.</string>
--- a/src/android/app/src/main/res/values-es/strings.xml
+++ b/src/android/app/src/main/res/values-es/strings.xml
@ -81,7 +81,6 @@
    <string name="manage_save_data">Administrar datos de guardado</string>
    <string name="manage_save_data_description">Guardar los datos encontrados. Por favor, seleccione una opción de abajo.</string>
    <string name="import_export_saves_description">Importar o exportar archivos de guardado</string>
-    <string name="import_export_saves_no_profile">No se han encontrado datos de guardado. Por favor, ejecute un juego y vuelva a intentarlo.</string>
    <string name="save_file_imported_success">Importado correctamente</string>
    <string name="save_file_invalid_zip_structure">Estructura del directorio de guardado no válido</string>
    <string name="save_file_invalid_zip_structure_description">El nombre de la primera subcarpeta debe ser el Title ID del juego.</string>
--- a/src/android/app/src/main/res/values-fr/strings.xml
+++ b/src/android/app/src/main/res/values-fr/strings.xml
@ -81,7 +81,6 @@
    <string name="manage_save_data">Gérer les données de sauvegarde</string>
    <string name="manage_save_data_description">Données de sauvegarde trouvées. Veuillez sélectionner une option ci-dessous.</string>
    <string name="import_export_saves_description">Importer ou exporter des fichiers de sauvegarde</string>
-    <string name="import_export_saves_no_profile">Aucune données de sauvegarde trouvées. Veuillez lancer un jeu et réessayer.</string>
    <string name="save_file_imported_success">Importé avec succès</string>
    <string name="save_file_invalid_zip_structure">Structure de répertoire de sauvegarde non valide</string>
    <string name="save_file_invalid_zip_structure_description">Le nom du premier sous-dossier doit être l\'identifiant du titre du jeu.</string>
--- a/src/android/app/src/main/res/values-it/strings.xml
+++ b/src/android/app/src/main/res/values-it/strings.xml
@ -81,7 +81,6 @@
    <string name="manage_save_data">Gestisci i salvataggi</string>
    <string name="manage_save_data_description">Salvataggio non trovato. Seleziona un\'opzione di seguito.</string>
    <string name="import_export_saves_description">Importa o esporta i salvataggi</string>
-    <string name="import_export_saves_no_profile">Nessun salvataggio trovato. Avvia un gioco e riprova.</string>
    <string name="save_file_imported_success">Importato con successo</string>
    <string name="save_file_invalid_zip_structure">La struttura della cartella dei salvataggi è invalida</string>
    <string name="save_file_invalid_zip_structure_description">La prima sotto cartella <b>deve</b> chiamarsi come l\'ID del titolo del gioco.</string>
--- a/src/android/app/src/main/res/values-ja/strings.xml
+++ b/src/android/app/src/main/res/values-ja/strings.xml
@ -80,7 +80,6 @@
    <string name="manage_save_data">セーブデータを管理</string>
    <string name="manage_save_data_description">セーブデータが見つかりました。以下のオプションから選択してください。</string>
    <string name="import_export_saves_description">セーブファイルをインポート/エクスポート</string>
-    <string name="import_export_saves_no_profile">セーブデータがありません。ゲームを起動してから再度お試しください。</string>
    <string name="save_file_imported_success">インポートが完了しました</string>
    <string name="save_file_invalid_zip_structure">セーブデータのディレクトリ構造が無効です</string>
    <string name="save_file_invalid_zip_structure_description">最初のサブフォルダ名は、ゲームのタイトルIDである必要があります。</string>
--- a/src/android/app/src/main/res/values-ko/strings.xml
+++ b/src/android/app/src/main/res/values-ko/strings.xml
@ -81,7 +81,6 @@
    <string name="manage_save_data">저장 데이터 관리</string>
    <string name="manage_save_data_description">데이터를 저장했습니다. 아래에서 옵션을 선택하세요.</string>
    <string name="import_export_saves_description">저장 파일 가져오기 또는 내보내기</string>
-    <string name="import_export_saves_no_profile">저장 데이터를 찾을 수 없습니다. 게임을 실행한 후 다시 시도하세요.</string>
    <string name="save_file_imported_success">가져오기 성공</string>
    <string name="save_file_invalid_zip_structure">저장 디렉터리 구조가 잘못됨</string>
    <string name="save_file_invalid_zip_structure_description">첫 번째 하위 폴더 이름은 게임의 타이틀 ID여야 합니다.</string>
--- a/src/android/app/src/main/res/values-nb/strings.xml
+++ b/src/android/app/src/main/res/values-nb/strings.xml
@ -81,7 +81,6 @@
    <string name="manage_save_data">Administrere lagringsdata</string>
    <string name="manage_save_data_description">Lagringsdata funnet. Velg et alternativ nedenfor.</string>
    <string name="import_export_saves_description">Importer eller eksporter lagringsfiler</string>
-    <string name="import_export_saves_no_profile">Ingen lagringsdata funnet. Start et nytt spill og prøv på nytt.</string>
    <string name="save_file_imported_success">Vellykket import</string>
    <string name="save_file_invalid_zip_structure">Ugyldig struktur for lagringskatalog</string>
    <string name="save_file_invalid_zip_structure_description">Det første undermappenavnet må være spillets tittel-ID.</string>
--- a/src/android/app/src/main/res/values-pl/strings.xml
+++ b/src/android/app/src/main/res/values-pl/strings.xml
@ -81,7 +81,6 @@
    <string name="manage_save_data">Zarządzaj plikami zapisów gier</string>
    <string name="manage_save_data_description">Znaleziono pliki zapisów gier. Wybierz opcję poniżej.</string>
    <string name="import_export_saves_description">Importuj lub wyeksportuj pliki zapisów</string>
-    <string name="import_export_saves_no_profile">Nie znaleziono plików zapisów. Uruchom grę i spróbuj ponownie.</string>
    <string name="save_file_imported_success">Zaimportowano pomyślnie</string>
    <string name="save_file_invalid_zip_structure">Niepoprawna struktura folderów</string>
    <string name="save_file_invalid_zip_structure_description">Pierwszy podkatalog musi zawierać w nazwie numer ID tytułu gry.</string>
--- a/src/android/app/src/main/res/values-pt-rBR/strings.xml
+++ b/src/android/app/src/main/res/values-pt-rBR/strings.xml
@ -81,7 +81,6 @@
    <string name="manage_save_data">Gerir dados guardados</string>
    <string name="manage_save_data_description">Dados não encontrados. Por favor seleciona uma opção abaixo.</string>
    <string name="import_export_saves_description">Importa ou exporta dados guardados</string>
-    <string name="import_export_saves_no_profile">Dados não encontrados. Por favor lança o jogo e tenta novamente.</string>
    <string name="save_file_imported_success">Importado com sucesso</string>
    <string name="save_file_invalid_zip_structure">Estrutura de diretório de dados invalida</string>
    <string name="save_file_invalid_zip_structure_description">O nome da primeira sub pasta tem de ser a ID do jogo.</string>
--- a/src/android/app/src/main/res/values-pt-rPT/strings.xml
+++ b/src/android/app/src/main/res/values-pt-rPT/strings.xml
@ -81,7 +81,6 @@
    <string name="manage_save_data">Gerir dados guardados</string>
    <string name="manage_save_data_description">Dados não encontrados. Por favor seleciona uma opção abaixo.</string>
    <string name="import_export_saves_description">Importa ou exporta dados guardados</string>
-    <string name="import_export_saves_no_profile">Dados não encontrados. Por favor lança o jogo e tenta novamente.</string>
    <string name="save_file_imported_success">Importado com sucesso</string>
    <string name="save_file_invalid_zip_structure">Estrutura de diretório de dados invalida</string>
    <string name="save_file_invalid_zip_structure_description">O nome da primeira sub pasta tem de ser a ID do jogo.</string>
--- a/src/android/app/src/main/res/values-ru/strings.xml
+++ b/src/android/app/src/main/res/values-ru/strings.xml
@ -81,7 +81,6 @@
    <string name="manage_save_data">Управление данными сохранений</string>
    <string name="manage_save_data_description">Найдено данные сохранений. Пожалуйста, выберите вариант ниже.</string>
    <string name="import_export_saves_description">Импорт или экспорт файлов сохранения</string>
-    <string name="import_export_saves_no_profile">Данные сохранений не найдены. Пожалуйста, запустите игру и повторите попытку.</string>
    <string name="save_file_imported_success">Успешно импортировано</string>
    <string name="save_file_invalid_zip_structure">Недопустимая структура папки сохранения</string>
    <string name="save_file_invalid_zip_structure_description">Название первой вложенной папки должно быть идентификатором игры.</string>
--- a/src/android/app/src/main/res/values-uk/strings.xml
+++ b/src/android/app/src/main/res/values-uk/strings.xml
@ -81,7 +81,6 @@
    <string name="manage_save_data">Керування даними збережень</string>
    <string name="manage_save_data_description">Знайдено дані збережень. Будь ласка, виберіть варіант нижче.</string>
    <string name="import_export_saves_description">Імпорт або експорт файлів збереження</string>
-    <string name="import_export_saves_no_profile">Дані збережень не знайдено. Будь ласка, запустіть гру та повторіть спробу.</string>
    <string name="save_file_imported_success">Успішно імпортовано</string>
    <string name="save_file_invalid_zip_structure">Неприпустима структура папки збереження</string>
    <string name="save_file_invalid_zip_structure_description">Назва першої вкладеної папки має бути ідентифікатором гри.</string>
--- a/src/android/app/src/main/res/values-w600dp/integers.xml
+++ b/src/android/app/src/main/res/values-w600dp/integers.xml
@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <integer name="grid_columns">2</integer>
+
+</resources>
--- a/src/android/app/src/main/res/values-zh-rCN/strings.xml
+++ b/src/android/app/src/main/res/values-zh-rCN/strings.xml
@ -81,7 +81,6 @@
    <string name="manage_save_data">管理存档数据</string>
    <string name="manage_save_data_description">已找到存档数据，请选择下方的选项。</string>
    <string name="import_export_saves_description">导入或导出存档</string>
-    <string name="import_export_saves_no_profile">找不到存档数据，请启动游戏并重试。</string>
    <string name="save_file_imported_success">已成功导入存档</string>
    <string name="save_file_invalid_zip_structure">无效的存档目录</string>
    <string name="save_file_invalid_zip_structure_description">第一个子文件夹名称必须为当前游戏的 ID。</string>
--- a/src/android/app/src/main/res/values-zh-rTW/strings.xml
+++ b/src/android/app/src/main/res/values-zh-rTW/strings.xml
@ -81,7 +81,6 @@
    <string name="manage_save_data">管理儲存資料</string>
    <string name="manage_save_data_description">已找到儲存資料，請選取下方的選項。</string>
    <string name="import_export_saves_description">匯入或匯出儲存檔案</string>
-    <string name="import_export_saves_no_profile">找不到儲存資料，請啟動遊戲並重試。</string>
    <string name="save_file_imported_success">已成功匯入</string>
    <string name="save_file_invalid_zip_structure">無效的儲存目錄結構</string>
    <string name="save_file_invalid_zip_structure_description">首個子資料夾名稱必須為遊戲標題 ID。</string>
--- a/src/android/app/src/main/res/values/integers.xml
+++ b/src/android/app/src/main/res/values/integers.xml
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <integer name="game_title_lines">2</integer>
+    <integer name="grid_columns">1</integer>

    <!-- Default SWITCH landscape layout -->
    <integer name="SWITCH_BUTTON_A_X">760</integer>
--- a/src/android/app/src/main/res/values/strings.xml
+++ b/src/android/app/src/main/res/values/strings.xml
@ -90,7 +90,6 @@
    <string name="manage_save_data">Manage save data</string>
    <string name="manage_save_data_description">Save data found. Please select an option below.</string>
    <string name="import_export_saves_description">Import or export save files</string>
-    <string name="import_export_saves_no_profile">No save data found. Please launch a game and retry.</string>
    <string name="save_file_imported_success">Imported successfully</string>
    <string name="save_file_invalid_zip_structure">Invalid save directory structure</string>
    <string name="save_file_invalid_zip_structure_description">The first subfolder name must be the title ID of the game.</string>
@ -101,12 +100,13 @@
    <string name="firmware_installing">Installing firmware</string>
    <string name="firmware_installed_success">Firmware installed successfully</string>
    <string name="firmware_installed_failure">Firmware installation failed</string>
-    <string name="firmware_installed_failure_description">Verify that the ZIP contains valid firmware and try again.</string>
+    <string name="firmware_installed_failure_description">Make sure the firmware nca files are at the root of the zip and try again.</string>
    <string name="share_log">Share debug logs</string>
    <string name="share_log_description">Share yuzu\'s log file to debug issues</string>
    <string name="share_log_missing">No log file found</string>
    <string name="install_game_content">Install game content</string>
    <string name="install_game_content_description">Install game updates or DLC</string>
+    <string name="installing_game_content">Installing content…</string>
    <string name="install_game_content_failure">Error installing file(s) to NAND</string>
    <string name="install_game_content_failure_description">Please ensure content(s) are valid and that the prod.keys file is installed.</string>
    <string name="install_game_content_failure_base">Installation of base games isn\'t permitted in order to avoid possible conflicts.</string>
@ -118,6 +118,10 @@
    <string name="install_game_content_help_link">https://yuzu-emu.org/help/quickstart/#dumping-installed-updates</string>
    <string name="custom_driver_not_supported">Custom drivers not supported</string>
    <string name="custom_driver_not_supported_description">Custom driver loading isn\'t currently supported for this device.\nCheck this option again in the future to see if support was added!</string>
+    <string name="manage_yuzu_data">Manage yuzu data</string>
+    <string name="manage_yuzu_data_description">Import/export firmware, keys, user data, and more!</string>
+    <string name="share_save_file">Share save file</string>
+    <string name="export_save_failed">Failed to export save</string>

    <!-- About screen strings -->
    <string name="gaia_is_not_real">Gaia isn\'t real</string>
@ -137,6 +141,7 @@
    <string name="user_data_export_success">User data exported successfully</string>
    <string name="user_data_import_success">User data imported successfully</string>
    <string name="user_data_export_cancelled">Export cancelled</string>
+    <string name="user_data_import_failed_description">Make sure the user data folders are at the root of the zip folder and contain a config file at config/config.ini and try again.</string>
    <string name="support_link">https://discord.gg/u77vRWY</string>
    <string name="website_link">https://yuzu-emu.org/</string>
    <string name="github_link">https://github.com/yuzu-emu</string>
@ -226,6 +231,8 @@
    <string name="string_null">Null</string>
    <string name="string_import">Import</string>
    <string name="export">Export</string>
+    <string name="export_failed">Export failed</string>
+    <string name="import_failed">Import failed</string>
    <string name="cancelling">Cancelling</string>

    <!-- GPU driver installation -->
--- a/src/core/hle/service/filesystem/fsp_srv.cpp
+++ b/src/core/hle/service/filesystem/fsp_srv.cpp
@ -329,6 +329,7 @@ public:
            {13, &IFileSystem::CleanDirectoryRecursively, "CleanDirectoryRecursively"},
            {14, &IFileSystem::GetFileTimeStampRaw, "GetFileTimeStampRaw"},
            {15, nullptr, "QueryEntry"},
+            {16, &IFileSystem::GetFileSystemAttribute, "GetFileSystemAttribute"},
        };
        RegisterHandlers(functions);
    }
@ -521,6 +522,46 @@ public:
        rb.PushRaw(vfs_timestamp);
    }

+    void GetFileSystemAttribute(HLERequestContext& ctx) {
+        LOG_WARNING(Service_FS, "(STUBBED) called");
+
+        struct FileSystemAttribute {
+            u8 dir_entry_name_length_max_defined;
+            u8 file_entry_name_length_max_defined;
+            u8 dir_path_name_length_max_defined;
+            u8 file_path_name_length_max_defined;
+            INSERT_PADDING_BYTES_NOINIT(0x5);
+            u8 utf16_dir_entry_name_length_max_defined;
+            u8 utf16_file_entry_name_length_max_defined;
+            u8 utf16_dir_path_name_length_max_defined;
+            u8 utf16_file_path_name_length_max_defined;
+            INSERT_PADDING_BYTES_NOINIT(0x18);
+            s32 dir_entry_name_length_max;
+            s32 file_entry_name_length_max;
+            s32 dir_path_name_length_max;
+            s32 file_path_name_length_max;
+            INSERT_PADDING_WORDS_NOINIT(0x5);
+            s32 utf16_dir_entry_name_length_max;
+            s32 utf16_file_entry_name_length_max;
+            s32 utf16_dir_path_name_length_max;
+            s32 utf16_file_path_name_length_max;
+            INSERT_PADDING_WORDS_NOINIT(0x18);
+            INSERT_PADDING_WORDS_NOINIT(0x1);
+        };
+        static_assert(sizeof(FileSystemAttribute) == 0xc0,
+                      "FileSystemAttribute has incorrect size");
+
+        FileSystemAttribute savedata_attribute{};
+        savedata_attribute.dir_entry_name_length_max_defined = true;
+        savedata_attribute.file_entry_name_length_max_defined = true;
+        savedata_attribute.dir_entry_name_length_max = 0x40;
+        savedata_attribute.file_entry_name_length_max = 0x40;
+
+        IPC::ResponseBuilder rb{ctx, 50};
+        rb.Push(ResultSuccess);
+        rb.PushRaw(savedata_attribute);
+    }
+
 private:
    VfsDirectoryServiceWrapper backend;
    SizeGetter size;