Conditional to non-android

Revert "host_memory: Allocate virtual_base with MAP_NORESERVE"
This reverts commit 4d7be85e73. Fix VK_ERROR_OUT_OF_DEVICE_MEMORY
2023-09-25 15:11:49 -05:00 · 2023-09-22 09:33:09 -05:00
462 changed files with 17225 additions and 61404 deletions
@@ -8,17 +8,8 @@ ccache -s

 BUILD_FLAVOR=mainline

-if [ ! -z "${ANDROID_KEYSTORE_B64}" ]; then
-    export ANDROID_KEYSTORE_FILE="${GITHUB_WORKSPACE}/ks.jks"
-    base64 --decode <<< "${ANDROID_KEYSTORE_B64}" > "${ANDROID_KEYSTORE_FILE}"
-fi
-
 cd src/android
 chmod +x ./gradlew
 ./gradlew "assemble${BUILD_FLAVOR}Release" "bundle${BUILD_FLAVOR}Release"

 ccache -s
-
-if [ ! -z "${ANDROID_KEYSTORE_B64}" ]; then
-    rm "${ANDROID_KEYSTORE_FILE}"
-fi
@@ -13,3 +13,15 @@ cp src/android/app/build/outputs/apk/"${BUILD_FLAVOR}/release/app-${BUILD_FLAVOR
  "artifacts/${REV_NAME}.apk"
 cp src/android/app/build/outputs/bundle/"${BUILD_FLAVOR}Release"/"app-${BUILD_FLAVOR}-release.aab" \
  "artifacts/${REV_NAME}.aab"
+
+if [ -n "${ANDROID_KEYSTORE_B64}" ]
+then
+  echo "Signing apk..."
+  base64 --decode <<< "${ANDROID_KEYSTORE_B64}" > ks.jks
+
+  apksigner sign --ks ks.jks \
+    --ks-key-alias "${ANDROID_KEY_ALIAS}" \
+    --ks-pass env:ANDROID_KEYSTORE_PASS "artifacts/${REV_NAME}.apk"
+else
+  echo "No keystore specified, not signing the APK files."
+fi
@@ -19,7 +19,6 @@ cmake .. \
      -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON \
      -DENABLE_QT_TRANSLATION=ON \
      -DUSE_DISCORD_PRESENCE=ON \
-      -DYUZU_CRASH_DUMPS=ON \
      -DYUZU_ENABLE_COMPATIBILITY_REPORTING=${ENABLE_COMPATIBILITY_REPORTING:-"OFF"} \
      -DYUZU_USE_BUNDLED_FFMPEG=ON \
      -GNinja
@@ -5,6 +5,6 @@

 GITDATE="`git show -s --date=short --format='%ad' | sed 's/-//g'`"
 GITREV="`git show -s --format='%h'`"
-ARTIFACTS_DIR="$PWD/artifacts"
+ARTIFACTS_DIR="artifacts"

 mkdir -p "${ARTIFACTS_DIR}/"
@@ -11,7 +11,7 @@ ccache -s
 mkdir build || true && cd build
 cmake .. \
      -DBoost_USE_STATIC_LIBS=ON \
-      -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+      -DCMAKE_BUILD_TYPE=Release \
      -DCMAKE_CXX_FLAGS="-march=x86-64-v2" \
      -DCMAKE_CXX_COMPILER=/usr/lib/ccache/g++ \
      -DCMAKE_C_COMPILER=/usr/lib/ccache/gcc \
@@ -23,7 +23,6 @@ cmake .. \
      -DYUZU_ENABLE_COMPATIBILITY_REPORTING=${ENABLE_COMPATIBILITY_REPORTING:-"OFF"} \
      -DYUZU_USE_BUNDLED_FFMPEG=ON \
      -DYUZU_ENABLE_LTO=ON \
-      -DYUZU_CRASH_DUMPS=ON \
      -GNinja

 ninja
@@ -32,19 +31,6 @@ ccache -s

 ctest -VV -C Release

-# Separate debug symbols from specified executables
-for EXE in yuzu; do
-    EXE_PATH="bin/$EXE"
-    # Copy debug symbols out
-    objcopy --only-keep-debug $EXE_PATH $EXE_PATH.debug
-    # Add debug link and strip debug symbols
-    objcopy -g --add-gnu-debuglink=$EXE_PATH.debug $EXE_PATH $EXE_PATH.out
-    # Overwrite original with stripped copy
-    mv $EXE_PATH.out $EXE_PATH
-done
-# Strip debug symbols from all executables
-find bin/ -type f -not -regex '.*.debug' -exec strip -g {} ';'
-
 DESTDIR="$PWD/AppDir" ninja install
 rm -vf AppDir/usr/bin/yuzu-cmd AppDir/usr/bin/yuzu-tester

@@ -59,9 +59,4 @@ if [ "${RELEASE_NAME}" = "mainline" ] || [ "${RELEASE_NAME}" = "early-access" ];
    cp "build/${APPIMAGE_NAME}" "${DIR_NAME}/yuzu-${RELEASE_NAME}.AppImage"
 fi

-# Copy debug symbols to artifacts
-cd build/bin
-tar $COMPRESSION_FLAGS "${ARTIFACTS_DIR}/${REV_NAME}-debug.tar.xz" *.debug
-cd -
-
 . .ci/scripts/common/post-upload.sh
@@ -17,6 +17,7 @@ cmake .. \
    -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON \
    -DENABLE_QT_TRANSLATION=ON \
    -DUSE_CCACHE=ON \
+    -DYUZU_CRASH_DUMPS=ON \
    -DYUZU_USE_BUNDLED_SDL2=OFF \
    -DYUZU_USE_EXTERNAL_SDL2=OFF \
    -DYUZU_TESTS=OFF \
@@ -3,4 +3,4 @@

 [codespell]
 skip = ./.git,./build,./dist,./Doxyfile,./externals,./LICENSES,./src/android/app/src/main/res
-ignore-words-list = aci,allright,ba,canonicalizations,deques,froms,hda,inout,lod,masia,nam,nax,nd,optin,pullrequests,pullrequest,te,transfered,unstall,uscaled,vas,zink
+ignore-words-list = aci,allright,ba,canonicalizations,deques,froms,hda,inout,lod,masia,nam,nax,nd,optin,pullrequests,pullrequest,te,transfered,unstall,uscaled,zink
@@ -32,7 +32,7 @@
 	path = externals/xbyak
 	url = https://github.com/herumi/xbyak.git
 [submodule "opus"]
-	path = externals/opus
+	path = externals/opus/opus
 	url = https://github.com/xiph/opus.git
 [submodule "SDL"]
 	path = externals/SDL
@@ -58,6 +58,3 @@
 [submodule "VulkanMemoryAllocator"]
 	path = externals/VulkanMemoryAllocator
 	url = https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git
-[submodule "breakpad"]
-	path = externals/breakpad
-	url = https://github.com/yuzu-emu/breakpad.git
@@ -147,7 +147,3 @@ License: GPL-3.0-or-later
 Files: src/android/gradle/wrapper/*
 Copyright: 2023 yuzu Emulator Project
 License: GPL-3.0-or-later
-
-Files: externals/stb/*
-Copyright: Sean Barrett
-License: MIT
@@ -11,6 +11,7 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/externals/cmake-modul
 include(DownloadExternals)
 include(CMakeDependentOption)
 include(CTest)
+include(FetchContent)

 # Set bundled sdl2/qt as dependent options.
 # OFF by default, but if ENABLE_SDL2 and MSVC are true then ON
@@ -52,7 +53,7 @@ option(YUZU_DOWNLOAD_ANDROID_VVL "Download validation layer binary for android"

 CMAKE_DEPENDENT_OPTION(YUZU_ROOM "Compile LDN room server" ON "NOT ANDROID" OFF)

-CMAKE_DEPENDENT_OPTION(YUZU_CRASH_DUMPS "Compile crash dump (Minidump) support" OFF "WIN32 OR LINUX" OFF)
+CMAKE_DEPENDENT_OPTION(YUZU_CRASH_DUMPS "Compile Windows crash dump (Minidump) support" OFF "WIN32" OFF)

 option(YUZU_USE_BUNDLED_VCPKG "Use vcpkg for yuzu dependencies" "${MSVC}")

@@ -98,8 +99,47 @@ if (ANDROID AND YUZU_DOWNLOAD_ANDROID_VVL)
            DESTINATION "${vvl_lib_path}")
 endif()

+# On Android, fetch and compile libcxx before doing anything else
 if (ANDROID)
    set(CMAKE_SKIP_INSTALL_RULES ON)
+    set(LLVM_VERSION "15.0.6")
+
+    # Note: even though libcxx and libcxxabi have separate releases on the project page,
+    # the separated releases cannot be compiled. Only in-tree builds work. Therefore we
+    # must fetch the source release for the entire llvm tree.
+    FetchContent_Declare(llvm
+        URL "https://github.com/llvm/llvm-project/releases/download/llvmorg-${LLVM_VERSION}/llvm-project-${LLVM_VERSION}.src.tar.xz"
+        URL_HASH SHA256=9d53ad04dc60cb7b30e810faf64c5ab8157dadef46c8766f67f286238256ff92
+        TLS_VERIFY TRUE
+    )
+    FetchContent_MakeAvailable(llvm)
+
+    # libcxx has support for most of the range library, but it's gated behind a flag:
+    add_compile_definitions(_LIBCPP_ENABLE_EXPERIMENTAL)
+
+    # Disable standard header inclusion
+    set(ANDROID_STL "none")
+
+    # libcxxabi
+    set(LIBCXXABI_INCLUDE_TESTS OFF)
+    set(LIBCXXABI_ENABLE_SHARED FALSE)
+    set(LIBCXXABI_ENABLE_STATIC TRUE)
+    set(LIBCXXABI_LIBCXX_INCLUDES "${LIBCXX_TARGET_INCLUDE_DIRECTORY}" CACHE STRING "" FORCE)
+    add_subdirectory("${llvm_SOURCE_DIR}/libcxxabi" "${llvm_BINARY_DIR}/libcxxabi")
+    link_libraries(cxxabi_static)
+
+    # libcxx
+    set(LIBCXX_ABI_NAMESPACE "__ndk1" CACHE STRING "" FORCE)
+    set(LIBCXX_CXX_ABI "libcxxabi")
+    set(LIBCXX_INCLUDE_TESTS OFF)
+    set(LIBCXX_INCLUDE_BENCHMARKS OFF)
+    set(LIBCXX_INCLUDE_DOCS OFF)
+    set(LIBCXX_ENABLE_SHARED FALSE)
+    set(LIBCXX_ENABLE_STATIC TRUE)
+    set(LIBCXX_ENABLE_ASSERTIONS FALSE)
+    add_subdirectory("${llvm_SOURCE_DIR}/libcxx" "${llvm_BINARY_DIR}/libcxx")
+    set_target_properties(cxx-headers PROPERTIES INTERFACE_COMPILE_OPTIONS "-isystem${CMAKE_BINARY_DIR}/${LIBCXX_INSTALL_INCLUDE_DIR}")
+    link_libraries(cxx_static cxx-headers)
 endif()

 if (YUZU_USE_BUNDLED_VCPKG)
@@ -139,6 +179,9 @@ if (YUZU_USE_BUNDLED_VCPKG)
    if (YUZU_TESTS)
        list(APPEND VCPKG_MANIFEST_FEATURES "yuzu-tests")
    endif()
+    if (YUZU_CRASH_DUMPS)
+        list(APPEND VCPKG_MANIFEST_FEATURES "dbghelp")
+    endif()
    if (ENABLE_WEB_SERVICE)
        list(APPEND VCPKG_MANIFEST_FEATURES "web-service")
    endif()
@@ -286,12 +329,11 @@ find_package(Boost 1.79.0 REQUIRED context)
 find_package(enet 1.3 MODULE)
 find_package(fmt 9 REQUIRED)
 find_package(inih 52 MODULE COMPONENTS INIReader)
-find_package(LLVM 17.0.2 MODULE COMPONENTS Demangle)
+find_package(LLVM 17 MODULE COMPONENTS Demangle)
 find_package(lz4 REQUIRED)
 find_package(nlohmann_json 3.8 REQUIRED)
 find_package(Opus 1.3 MODULE)
 find_package(RenderDoc MODULE)
-find_package(stb MODULE)
 find_package(VulkanMemoryAllocator CONFIG)
 find_package(ZLIB 1.2 REQUIRED)
 find_package(zstd 1.5 REQUIRED)
@@ -358,9 +400,6 @@ function(set_yuzu_qt_components)
    if (ENABLE_QT_TRANSLATION)
        list(APPEND YUZU_QT_COMPONENTS2 LinguistTools)
    endif()
-    if (USE_DISCORD_PRESENCE)
-        list(APPEND YUZU_QT_COMPONENTS2 Network)
-    endif()
    set(YUZU_QT_COMPONENTS ${YUZU_QT_COMPONENTS2} PARENT_SCOPE)
 endfunction(set_yuzu_qt_components)

@@ -548,18 +587,6 @@ if (NOT YUZU_USE_BUNDLED_FFMPEG)
    find_package(FFmpeg 4.3 REQUIRED QUIET COMPONENTS ${FFmpeg_COMPONENTS})
 endif()

-if (WIN32 AND YUZU_CRASH_DUMPS)
-    set(BREAKPAD_VER "breakpad-c89f9dd")
-    download_bundled_external("breakpad/" ${BREAKPAD_VER} BREAKPAD_PREFIX)
-
-    set(BREAKPAD_CLIENT_INCLUDE_DIR "${BREAKPAD_PREFIX}/include")
-    set(BREAKPAD_CLIENT_LIBRARY "${BREAKPAD_PREFIX}/lib/libbreakpad_client.lib")
-
-    add_library(libbreakpad_client INTERFACE IMPORTED)
-    target_link_libraries(libbreakpad_client INTERFACE "${BREAKPAD_CLIENT_LIBRARY}")
-    target_include_directories(libbreakpad_client INTERFACE "${BREAKPAD_CLIENT_INCLUDE_DIR}")
-endif()
-
 # Prefer the -pthread flag on Linux.
 set(THREADS_PREFER_PTHREAD_FLAG ON)
 find_package(Threads REQUIRED)
@@ -579,6 +606,13 @@ elseif (WIN32)
        # PSAPI is the Process Status API
        set(PLATFORM_LIBRARIES ${PLATFORM_LIBRARIES} psapi imm32 version)
    endif()
+
+    if (YUZU_CRASH_DUMPS)
+        find_library(DBGHELP_LIBRARY dbghelp)
+        if ("${DBGHELP_LIBRARY}" STREQUAL "DBGHELP_LIBRARY-NOTFOUND")
+            message(FATAL_ERROR "YUZU_CRASH_DUMPS enabled but dbghelp library not found")
+        endif()
+    endif()
 elseif (CMAKE_SYSTEM_NAME MATCHES "^(Linux|kFreeBSD|GNU|SunOS)$")
    set(PLATFORM_LIBRARIES rt)
 endif()
@@ -1,31 +0,0 @@
-# SPDX-FileCopyrightText: 2023 Alexandre Bouvier <contact@amb.tf>
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-find_path(stb_image_INCLUDE_DIR stb_image.h PATH_SUFFIXES stb)
-find_path(stb_image_resize_INCLUDE_DIR stb_image_resize.h PATH_SUFFIXES stb)
-find_path(stb_image_write_INCLUDE_DIR stb_image_write.h PATH_SUFFIXES stb)
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(stb
-    REQUIRED_VARS
-        stb_image_INCLUDE_DIR
-        stb_image_resize_INCLUDE_DIR
-        stb_image_write_INCLUDE_DIR
-)
-
-if (stb_FOUND AND NOT TARGET stb::headers)
-    add_library(stb::headers INTERFACE IMPORTED)
-    set_property(TARGET stb::headers PROPERTY
-        INTERFACE_INCLUDE_DIRECTORIES
-            "${stb_image_INCLUDE_DIR}"
-            "${stb_image_resize_INCLUDE_DIR}"
-            "${stb_image_write_INCLUDE_DIR}"
-    )
-endif()
-
-mark_as_advanced(
-    stb_image_INCLUDE_DIR
-    stb_image_resize_INCLUDE_DIR
-    stb_image_write_INCLUDE_DIR
-)
@@ -1,7 +1,7 @@
 # SPDX-FileCopyrightText: 2019 yuzu Emulator Project
 # SPDX-License-Identifier: GPL-2.0-or-later

-# Gets a UTC timestamp and sets the provided variable to it
+# Gets a UTC timstamp and sets the provided variable to it
 function(get_timestamp _var)
    string(TIMESTAMP timestamp UTC)
    set(${_var} "${timestamp}" PARENT_SCOPE)
@@ -13,4 +13,3 @@ Exec=yuzu %f
 Categories=Game;Emulator;Qt;
 MimeType=application/x-nx-nro;application/x-nx-nso;application/x-nx-nsp;application/x-nx-xci;
 Keywords=Nintendo;Switch;
-StartupWMClass=yuzu
@@ -120,10 +120,6 @@ QWidget#connectedControllers {
    background: transparent;
 }

-QWidget#closeButtons {
-    background: transparent;
-}
-
 QWidget#playersSupported,
 QWidget#controllersSupported,
 QWidget#controllerSupported1,
@@ -1380,10 +1380,6 @@ QWidget#connectedControllers {
    background: transparent;
 }

-QWidget#closeButtons {
-    background: transparent;
-}
-
 QWidget#playersSupported,
 QWidget#controllersSupported,
 QWidget#controllerSupported1,
@@ -2305,10 +2305,6 @@ QWidget#connectedControllers {
  background: transparent;
 }

-QWidget#closeButtons {
-    background: transparent;
-}
-
 QWidget#playersSupported,
 QWidget#controllersSupported,
 QWidget#controllerSupported1,
@@ -134,10 +134,6 @@ endif()

 # Opus
 if (NOT TARGET Opus::opus)
-    set(OPUS_BUILD_TESTING OFF)
-    set(OPUS_BUILD_PROGRAMS OFF)
-    set(OPUS_INSTALL_PKG_CONFIG_MODULE OFF)
-    set(OPUS_INSTALL_CMAKE_CONFIG_MODULE OFF)
    add_subdirectory(opus)
 endif()

@@ -175,10 +171,6 @@ endif()
 add_library(stb stb/stb_dxt.cpp)
 target_include_directories(stb PUBLIC ./stb)

-if (NOT TARGET stb::headers)
-    add_library(stb::headers ALIAS stb)
-endif()
-
 add_library(bc_decoder bc_decoder/bc_decoder.cpp)
 target_include_directories(bc_decoder PUBLIC ./bc_decoder)

@@ -193,105 +185,3 @@ if (ANDROID)
       add_subdirectory(libadrenotools)
   endif()
 endif()
-
-# Breakpad
-# https://github.com/microsoft/vcpkg/blob/master/ports/breakpad/CMakeLists.txt
-if (YUZU_CRASH_DUMPS AND NOT TARGET libbreakpad_client)
-    set(BREAKPAD_WIN32_DEFINES
-        NOMINMAX
-        UNICODE
-        WIN32_LEAN_AND_MEAN
-        _CRT_SECURE_NO_WARNINGS
-        _CRT_SECURE_NO_DEPRECATE
-        _CRT_NONSTDC_NO_DEPRECATE
-    )
-
-    # libbreakpad
-    add_library(libbreakpad STATIC)
-    file(GLOB_RECURSE LIBBREAKPAD_SOURCES breakpad/src/processor/*.cc)
-    file(GLOB_RECURSE LIBDISASM_SOURCES breakpad/src/third_party/libdisasm/*.c)
-    list(FILTER LIBBREAKPAD_SOURCES EXCLUDE REGEX "_unittest|_selftest|synth_minidump|/tests|/testdata|/solaris|microdump_stackwalk|minidump_dump|minidump_stackwalk")
-    if (WIN32)
-        list(FILTER LIBBREAKPAD_SOURCES EXCLUDE REGEX "/linux|/mac|/android")
-        target_compile_definitions(libbreakpad PRIVATE ${BREAKPAD_WIN32_DEFINES})
-        target_include_directories(libbreakpad PRIVATE "${CMAKE_GENERATOR_INSTANCE}/DIA SDK/include")
-    elseif (APPLE)
-        list(FILTER LIBBREAKPAD_SOURCES EXCLUDE REGEX "/linux|/windows|/android")
-    else()
-        list(FILTER LIBBREAKPAD_SOURCES EXCLUDE REGEX "/mac|/windows|/android")
-    endif()
-    target_sources(libbreakpad PRIVATE ${LIBBREAKPAD_SOURCES} ${LIBDISASM_SOURCES})
-    target_include_directories(libbreakpad
-        PUBLIC
-            ${CMAKE_CURRENT_SOURCE_DIR}/breakpad/src
-            ${CMAKE_CURRENT_SOURCE_DIR}/breakpad/src/third_party/libdisasm
-    )
-
-    # libbreakpad_client
-    add_library(libbreakpad_client STATIC)
-    file(GLOB LIBBREAKPAD_COMMON_SOURCES breakpad/src/common/*.cc breakpad/src/common/*.c breakpad/src/client/*.cc)
-
-    if (WIN32)
-        file(GLOB_RECURSE LIBBREAKPAD_CLIENT_SOURCES breakpad/src/client/windows/*.cc breakpad/src/common/windows/*.cc)
-        list(FILTER LIBBREAKPAD_COMMON_SOURCES EXCLUDE REGEX "language.cc|path_helper.cc|stabs_to_module.cc|stabs_reader.cc|minidump_file_writer.cc")
-        target_include_directories(libbreakpad_client PRIVATE "${CMAKE_GENERATOR_INSTANCE}/DIA SDK/include")
-        target_compile_definitions(libbreakpad_client PRIVATE ${BREAKPAD_WIN32_DEFINES})
-    elseif (APPLE)
-        target_compile_definitions(libbreakpad_client PRIVATE HAVE_MACH_O_NLIST_H)
-        file(GLOB_RECURSE LIBBREAKPAD_CLIENT_SOURCES breakpad/src/client/mac/*.cc breakpad/src/common/mac/*.cc)
-        list(APPEND LIBBREAKPAD_CLIENT_SOURCES breakpad/src/common/mac/MachIPC.mm)
-    else()
-        target_compile_definitions(libbreakpad_client PUBLIC -DHAVE_A_OUT_H)
-        file(GLOB_RECURSE LIBBREAKPAD_CLIENT_SOURCES breakpad/src/client/linux/*.cc breakpad/src/common/linux/*.cc)
-    endif()
-    list(APPEND LIBBREAKPAD_CLIENT_SOURCES ${LIBBREAKPAD_COMMON_SOURCES})
-    list(FILTER LIBBREAKPAD_CLIENT_SOURCES EXCLUDE REGEX "/sender|/tests|/unittests|/testcases|_unittest|_test")
-    target_sources(libbreakpad_client PRIVATE ${LIBBREAKPAD_CLIENT_SOURCES})
-    target_include_directories(libbreakpad_client PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/breakpad/src)
-
-    if (WIN32)
-        target_link_libraries(libbreakpad_client PRIVATE wininet.lib)
-    elseif (APPLE)
-        find_library(CoreFoundation_FRAMEWORK CoreFoundation)
-        target_link_libraries(libbreakpad_client PRIVATE ${CoreFoundation_FRAMEWORK})
-    else()
-        find_library(PTHREAD_LIBRARIES pthread)
-        target_compile_definitions(libbreakpad_client PRIVATE HAVE_GETCONTEXT=1)
-        if (PTHREAD_LIBRARIES)
-            target_link_libraries(libbreakpad_client PRIVATE ${PTHREAD_LIBRARIES})
-        endif()
-    endif()
-
-    # Host tools for symbol processing
-    if (LINUX)
-        find_package(ZLIB REQUIRED)
-
-        add_executable(minidump_stackwalk breakpad/src/processor/minidump_stackwalk.cc)
-        target_link_libraries(minidump_stackwalk PRIVATE libbreakpad libbreakpad_client)
-
-        add_executable(dump_syms
-            breakpad/src/common/dwarf_cfi_to_module.cc
-            breakpad/src/common/dwarf_cu_to_module.cc
-            breakpad/src/common/dwarf_line_to_module.cc
-            breakpad/src/common/dwarf_range_list_handler.cc
-            breakpad/src/common/language.cc
-            breakpad/src/common/module.cc
-            breakpad/src/common/path_helper.cc
-            breakpad/src/common/stabs_reader.cc
-            breakpad/src/common/stabs_to_module.cc
-            breakpad/src/common/dwarf/bytereader.cc
-            breakpad/src/common/dwarf/dwarf2diehandler.cc
-            breakpad/src/common/dwarf/dwarf2reader.cc
-            breakpad/src/common/dwarf/elf_reader.cc
-            breakpad/src/common/linux/crc32.cc
-            breakpad/src/common/linux/dump_symbols.cc
-            breakpad/src/common/linux/elf_symbols_to_module.cc
-            breakpad/src/common/linux/elfutils.cc
-            breakpad/src/common/linux/file_id.cc
-            breakpad/src/common/linux/linux_libc_support.cc
-            breakpad/src/common/linux/memory_mapped_file.cc
-            breakpad/src/common/linux/safe_readlink.cc
-            breakpad/src/tools/linux/dump_syms/dump_syms.cc)
-        target_link_libraries(dump_syms PRIVATE libbreakpad_client ZLIB::ZLIB)
-    endif()
-endif()
@@ -49,6 +49,11 @@ if (MINGW OR (${CMAKE_SYSTEM_NAME} MATCHES "Linux") OR APPLE)

    set(LIBUSB_INCLUDE_DIRS "${LIBUSB_SRC_DIR}/libusb" CACHE PATH "libusb headers path" FORCE)

+    # MINGW: causes "externals/libusb/libusb/libusb/os/windows_winusb.c:1427:2: error: conversion to non-scalar type requested", so cannot statically link it for now.
+    if (NOT MINGW)
+        set(LIBUSB_CFLAGS "-DGUID_DEVINTERFACE_USB_DEVICE=\\(GUID\\){0xA5DCBF10,0x6530,0x11D2,{0x90,0x1F,0x00,0xC0,0x4F,0xB9,0x51,0xED}}")
+    endif()
+
    make_directory("${LIBUSB_PREFIX}")

    add_custom_command(
@@ -141,6 +146,8 @@ else() # MINGW OR (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
            target_include_directories(usb BEFORE PRIVATE libusb/msvc)
        endif()

+        # Works around other libraries providing their own definition of USB GUIDs (e.g. SDL2)
+        target_compile_definitions(usb PRIVATE "-DGUID_DEVINTERFACE_USB_DEVICE=(GUID){ 0xA5DCBF10, 0x6530, 0x11D2, {0x90, 0x1F, 0x00, 0xC0, 0x4F, 0xB9, 0x51, 0xED}}")
    else()
        target_include_directories(usb
            # turns out other projects also have "config.h", so make sure the
@@ -27,7 +27,7 @@ if (CMAKE_SYSTEM_NAME STREQUAL "Windows" OR ANDROID)
    set(CAN_BUILD_NX_TZDB false)
 endif()

-set(NX_TZDB_VERSION "221202")
+set(NX_TZDB_VERSION "220816")
 set(NX_TZDB_ARCHIVE "${CMAKE_CURRENT_BINARY_DIR}/${NX_TZDB_VERSION}.zip")

 set(NX_TZDB_ROMFS_DIR "${CMAKE_CURRENT_BINARY_DIR}/nx_tzdb")
@@ -0,0 +1,259 @@
+# SPDX-FileCopyrightText: 2019 yuzu Emulator Project
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+cmake_minimum_required(VERSION 3.8)
+
+project(opus)
+
+option(OPUS_STACK_PROTECTOR "Use stack protection" OFF)
+option(OPUS_USE_ALLOCA "Use alloca for stack arrays (on non-C99 compilers)" OFF)
+option(OPUS_CUSTOM_MODES "Enable non-Opus modes, e.g. 44.1 kHz & 2^n frames" OFF)
+option(OPUS_FIXED_POINT "Compile as fixed-point (for machines without a fast enough FPU)" OFF)
+option(OPUS_ENABLE_FLOAT_API "Compile with the floating point API (for machines with float library" ON)
+
+include(opus/opus_functions.cmake)
+
+if(OPUS_STACK_PROTECTOR)
+    if(NOT MSVC) # GC on by default on MSVC
+        check_and_set_flag(STACK_PROTECTION_STRONG -fstack-protector-strong)
+    endif()
+else()
+    if(MSVC)
+        check_and_set_flag(BUFFER_SECURITY_CHECK /GS-)
+    endif()
+endif()
+
+add_library(opus
+    # CELT sources
+    opus/celt/bands.c
+    opus/celt/celt.c
+    opus/celt/celt_decoder.c
+    opus/celt/celt_encoder.c
+    opus/celt/celt_lpc.c
+    opus/celt/cwrs.c
+    opus/celt/entcode.c
+    opus/celt/entdec.c
+    opus/celt/entenc.c
+    opus/celt/kiss_fft.c
+    opus/celt/laplace.c
+    opus/celt/mathops.c
+    opus/celt/mdct.c
+    opus/celt/modes.c
+    opus/celt/pitch.c
+    opus/celt/quant_bands.c
+    opus/celt/rate.c
+    opus/celt/vq.c
+
+    # SILK sources
+    opus/silk/A2NLSF.c
+    opus/silk/CNG.c
+    opus/silk/HP_variable_cutoff.c
+    opus/silk/LPC_analysis_filter.c
+    opus/silk/LPC_fit.c
+    opus/silk/LPC_inv_pred_gain.c
+    opus/silk/LP_variable_cutoff.c
+    opus/silk/NLSF2A.c
+    opus/silk/NLSF_VQ.c
+    opus/silk/NLSF_VQ_weights_laroia.c
+    opus/silk/NLSF_decode.c
+    opus/silk/NLSF_del_dec_quant.c
+    opus/silk/NLSF_encode.c
+    opus/silk/NLSF_stabilize.c
+    opus/silk/NLSF_unpack.c
+    opus/silk/NSQ.c
+    opus/silk/NSQ_del_dec.c
+    opus/silk/PLC.c
+    opus/silk/VAD.c
+    opus/silk/VQ_WMat_EC.c
+    opus/silk/ana_filt_bank_1.c
+    opus/silk/biquad_alt.c
+    opus/silk/bwexpander.c
+    opus/silk/bwexpander_32.c
+    opus/silk/check_control_input.c
+    opus/silk/code_signs.c
+    opus/silk/control_SNR.c
+    opus/silk/control_audio_bandwidth.c
+    opus/silk/control_codec.c
+    opus/silk/dec_API.c
+    opus/silk/decode_core.c
+    opus/silk/decode_frame.c
+    opus/silk/decode_indices.c
+    opus/silk/decode_parameters.c
+    opus/silk/decode_pitch.c
+    opus/silk/decode_pulses.c
+    opus/silk/decoder_set_fs.c
+    opus/silk/enc_API.c
+    opus/silk/encode_indices.c
+    opus/silk/encode_pulses.c
+    opus/silk/gain_quant.c
+    opus/silk/init_decoder.c
+    opus/silk/init_encoder.c
+    opus/silk/inner_prod_aligned.c
+    opus/silk/interpolate.c
+    opus/silk/lin2log.c
+    opus/silk/log2lin.c
+    opus/silk/pitch_est_tables.c
+    opus/silk/process_NLSFs.c
+    opus/silk/quant_LTP_gains.c
+    opus/silk/resampler.c
+    opus/silk/resampler_down2.c
+    opus/silk/resampler_down2_3.c
+    opus/silk/resampler_private_AR2.c
+    opus/silk/resampler_private_IIR_FIR.c
+    opus/silk/resampler_private_down_FIR.c
+    opus/silk/resampler_private_up2_HQ.c
+    opus/silk/resampler_rom.c
+    opus/silk/shell_coder.c
+    opus/silk/sigm_Q15.c
+    opus/silk/sort.c
+    opus/silk/stereo_LR_to_MS.c
+    opus/silk/stereo_MS_to_LR.c
+    opus/silk/stereo_decode_pred.c
+    opus/silk/stereo_encode_pred.c
+    opus/silk/stereo_find_predictor.c
+    opus/silk/stereo_quant_pred.c
+    opus/silk/sum_sqr_shift.c
+    opus/silk/table_LSF_cos.c
+    opus/silk/tables_LTP.c
+    opus/silk/tables_NLSF_CB_NB_MB.c
+    opus/silk/tables_NLSF_CB_WB.c
+    opus/silk/tables_gain.c
+    opus/silk/tables_other.c
+    opus/silk/tables_pitch_lag.c
+    opus/silk/tables_pulses_per_block.c
+
+    # Opus sources
+    opus/src/analysis.c
+    opus/src/mapping_matrix.c
+    opus/src/mlp.c
+    opus/src/mlp_data.c
+    opus/src/opus.c
+    opus/src/opus_decoder.c
+    opus/src/opus_encoder.c
+    opus/src/opus_multistream.c
+    opus/src/opus_multistream_decoder.c
+    opus/src/opus_multistream_encoder.c
+    opus/src/opus_projection_decoder.c
+    opus/src/opus_projection_encoder.c
+    opus/src/repacketizer.c
+)
+
+if (DEBUG)
+    target_sources(opus PRIVATE opus/silk/debug.c)
+endif()
+
+if (OPUS_FIXED_POINT)
+    target_sources(opus PRIVATE
+        opus/silk/fixed/LTP_analysis_filter_FIX.c
+        opus/silk/fixed/LTP_scale_ctrl_FIX.c
+        opus/silk/fixed/apply_sine_window_FIX.c
+        opus/silk/fixed/autocorr_FIX.c
+        opus/silk/fixed/burg_modified_FIX.c
+        opus/silk/fixed/corrMatrix_FIX.c
+        opus/silk/fixed/encode_frame_FIX.c
+        opus/silk/fixed/find_LPC_FIX.c
+        opus/silk/fixed/find_LTP_FIX.c
+        opus/silk/fixed/find_pitch_lags_FIX.c
+        opus/silk/fixed/find_pred_coefs_FIX.c
+        opus/silk/fixed/k2a_FIX.c
+        opus/silk/fixed/k2a_Q16_FIX.c
+        opus/silk/fixed/noise_shape_analysis_FIX.c
+        opus/silk/fixed/pitch_analysis_core_FIX.c
+        opus/silk/fixed/prefilter_FIX.c
+        opus/silk/fixed/process_gains_FIX.c
+        opus/silk/fixed/regularize_correlations_FIX.c
+        opus/silk/fixed/residual_energy16_FIX.c
+        opus/silk/fixed/residual_energy_FIX.c
+        opus/silk/fixed/schur64_FIX.c
+        opus/silk/fixed/schur_FIX.c
+        opus/silk/fixed/solve_LS_FIX.c
+        opus/silk/fixed/vector_ops_FIX.c
+        opus/silk/fixed/warped_autocorrelation_FIX.c
+    )
+else()
+    target_sources(opus PRIVATE
+        opus/silk/float/LPC_analysis_filter_FLP.c
+        opus/silk/float/LPC_inv_pred_gain_FLP.c
+        opus/silk/float/LTP_analysis_filter_FLP.c
+        opus/silk/float/LTP_scale_ctrl_FLP.c
+        opus/silk/float/apply_sine_window_FLP.c
+        opus/silk/float/autocorrelation_FLP.c
+        opus/silk/float/burg_modified_FLP.c
+        opus/silk/float/bwexpander_FLP.c
+        opus/silk/float/corrMatrix_FLP.c
+        opus/silk/float/encode_frame_FLP.c
+        opus/silk/float/energy_FLP.c
+        opus/silk/float/find_LPC_FLP.c
+        opus/silk/float/find_LTP_FLP.c
+        opus/silk/float/find_pitch_lags_FLP.c
+        opus/silk/float/find_pred_coefs_FLP.c
+        opus/silk/float/inner_product_FLP.c
+        opus/silk/float/k2a_FLP.c
+        opus/silk/float/noise_shape_analysis_FLP.c
+        opus/silk/float/pitch_analysis_core_FLP.c
+        opus/silk/float/process_gains_FLP.c
+        opus/silk/float/regularize_correlations_FLP.c
+        opus/silk/float/residual_energy_FLP.c
+        opus/silk/float/scale_copy_vector_FLP.c
+        opus/silk/float/scale_vector_FLP.c
+        opus/silk/float/schur_FLP.c
+        opus/silk/float/sort_FLP.c
+        opus/silk/float/warped_autocorrelation_FLP.c
+        opus/silk/float/wrappers_FLP.c
+    )
+endif()
+
+target_compile_definitions(opus PRIVATE OPUS_BUILD ENABLE_HARDENING)
+
+if(NOT MSVC)
+    if(MINGW)
+        target_compile_definitions(opus PRIVATE _FORTIFY_SOURCE=0)
+    else()
+        target_compile_definitions(opus PRIVATE _FORTIFY_SOURCE=2)
+    endif()
+endif()
+
+# It is strongly recommended to uncomment one of these VAR_ARRAYS: Use C99
+# variable-length arrays for stack allocation USE_ALLOCA: Use alloca() for stack
+# allocation If none is defined, then the fallback is a non-threadsafe global
+# array
+if(OPUS_USE_ALLOCA OR MSVC)
+    target_compile_definitions(opus PRIVATE USE_ALLOCA)
+else()
+    target_compile_definitions(opus PRIVATE VAR_ARRAYS)
+endif()
+
+if(OPUS_CUSTOM_MODES)
+    target_compile_definitions(opus PRIVATE CUSTOM_MODES)
+endif()
+
+if(NOT OPUS_ENABLE_FLOAT_API)
+    target_compile_definitions(opus PRIVATE DISABLE_FLOAT_API)
+endif()
+
+target_compile_definitions(opus
+PUBLIC
+    -DOPUS_VERSION="\\"1.3.1\\""
+
+PRIVATE
+    # Use C99 intrinsics to speed up float-to-int conversion
+    HAVE_LRINTF
+)
+
+if (FIXED_POINT)
+    target_compile_definitions(opus PRIVATE -DFIXED_POINT=1 -DDISABLE_FLOAT_API)
+endif()
+
+target_include_directories(opus
+PUBLIC
+    opus/include
+
+PRIVATE
+    opus/celt
+    opus/silk
+    opus/silk/fixed
+    opus/silk/float
+    opus/src
+)
+
+add_library(Opus::opus ALIAS opus)
@@ -27,7 +27,7 @@ android {
    namespace = "org.yuzu.yuzu_emu"

    compileSdkVersion = "android-34"
-    ndkVersion = "26.1.10909125"
+    ndkVersion = "25.2.9519653"

    buildFeatures {
        viewBinding = true
@@ -47,10 +47,6 @@ android {
        jniLibs.useLegacyPackaging = true
    }

-    androidResources {
-        generateLocaleConfig = true
-    }
-
    defaultConfig {
        // TODO If this is ever modified, change application_id in strings.xml
        applicationId = "org.yuzu.yuzu_emu"
@@ -207,23 +203,23 @@ ktlint {
 }

 dependencies {
-    implementation("androidx.core:core-ktx:1.12.0")
+    implementation("androidx.core:core-ktx:1.10.1")
    implementation("androidx.appcompat:appcompat:1.6.1")
-    implementation("androidx.recyclerview:recyclerview:1.3.1")
+    implementation("androidx.recyclerview:recyclerview:1.3.0")
    implementation("androidx.constraintlayout:constraintlayout:2.1.4")
-    implementation("androidx.fragment:fragment-ktx:1.6.1")
+    implementation("androidx.fragment:fragment-ktx:1.6.0")
    implementation("androidx.documentfile:documentfile:1.0.1")
    implementation("com.google.android.material:material:1.9.0")
-    implementation("androidx.preference:preference-ktx:1.2.1")
-    implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2")
+    implementation("androidx.preference:preference:1.2.0")
+    implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1")
    implementation("io.coil-kt:coil:2.2.2")
    implementation("androidx.core:core-splashscreen:1.0.1")
    implementation("androidx.window:window:1.2.0-beta03")
    implementation("org.ini4j:ini4j:0.5.4")
    implementation("androidx.constraintlayout:constraintlayout:2.1.4")
    implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0")
-    implementation("androidx.navigation:navigation-fragment-ktx:2.7.4")
-    implementation("androidx.navigation:navigation-ui-ktx:2.7.4")
+    implementation("androidx.navigation:navigation-fragment-ktx:2.6.0")
+    implementation("androidx.navigation:navigation-ui-ktx:2.6.0")
    implementation("info.debatty:java-string-similarity:2.0.0")
    implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.0")
 }
@@ -26,7 +26,9 @@ SPDX-License-Identifier: GPL-3.0-or-later
        android:supportsRtl="true"
        android:isGame="true"
        android:appCategory="game"
+        android:localeConfig="@xml/locales_config"
        android:banner="@drawable/tv_banner"
+        android:extractNativeLibs="true"
        android:fullBackupContent="@xml/data_extraction_rules"
        android:dataExtractionRules="@xml/data_extraction_rules_api_31"
        android:enableOnBackInvokedCallback="true">
@@ -5,7 +5,6 @@ package org.yuzu.yuzu_emu

 import android.app.Dialog
 import android.content.DialogInterface
-import android.net.Uri
 import android.os.Bundle
 import android.text.Html
 import android.text.method.LinkMovementMethod
@@ -16,9 +15,13 @@ import androidx.annotation.Keep
 import androidx.fragment.app.DialogFragment
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import java.lang.ref.WeakReference
+import org.yuzu.yuzu_emu.YuzuApplication.Companion.appContext
 import org.yuzu.yuzu_emu.activities.EmulationActivity
-import org.yuzu.yuzu_emu.utils.DocumentsTree
-import org.yuzu.yuzu_emu.utils.FileUtil
+import org.yuzu.yuzu_emu.utils.DocumentsTree.Companion.isNativePath
+import org.yuzu.yuzu_emu.utils.FileUtil.exists
+import org.yuzu.yuzu_emu.utils.FileUtil.getFileSize
+import org.yuzu.yuzu_emu.utils.FileUtil.isDirectory
+import org.yuzu.yuzu_emu.utils.FileUtil.openContentUri
 import org.yuzu.yuzu_emu.utils.Log
 import org.yuzu.yuzu_emu.utils.SerializableHelper.serializable

@@ -69,61 +72,43 @@ object NativeLibrary {
    @Keep
    @JvmStatic
    fun openContentUri(path: String?, openmode: String?): Int {
-        return if (DocumentsTree.isNativePath(path!!)) {
+        return if (isNativePath(path!!)) {
            YuzuApplication.documentsTree!!.openContentUri(path, openmode)
        } else {
-            FileUtil.openContentUri(path, openmode)
+            openContentUri(appContext, path, openmode)
        }
    }

    @Keep
    @JvmStatic
    fun getSize(path: String?): Long {
-        return if (DocumentsTree.isNativePath(path!!)) {
+        return if (isNativePath(path!!)) {
            YuzuApplication.documentsTree!!.getFileSize(path)
        } else {
-            FileUtil.getFileSize(path)
+            getFileSize(appContext, path)
        }
    }

    @Keep
    @JvmStatic
    fun exists(path: String?): Boolean {
-        return if (DocumentsTree.isNativePath(path!!)) {
+        return if (isNativePath(path!!)) {
            YuzuApplication.documentsTree!!.exists(path)
        } else {
-            FileUtil.exists(path, suppressLog = true)
+            exists(appContext, path)
        }
    }

    @Keep
    @JvmStatic
    fun isDirectory(path: String?): Boolean {
-        return if (DocumentsTree.isNativePath(path!!)) {
+        return if (isNativePath(path!!)) {
            YuzuApplication.documentsTree!!.isDirectory(path)
        } else {
-            FileUtil.isDirectory(path)
+            isDirectory(appContext, path)
        }
    }

-    @Keep
-    @JvmStatic
-    fun getParentDirectory(path: String): String =
-        if (DocumentsTree.isNativePath(path)) {
-            YuzuApplication.documentsTree!!.getParentDirectory(path)
-        } else {
-            path
-        }
-
-    @Keep
-    @JvmStatic
-    fun getFilename(path: String): String =
-        if (DocumentsTree.isNativePath(path)) {
-            YuzuApplication.documentsTree!!.getFilename(path)
-        } else {
-            FileUtil.getFilename(Uri.parse(path))
-        }
-
    /**
     * Returns true if pro controller isn't available and handheld is
     */
@@ -234,14 +219,35 @@ object NativeLibrary {

    external fun initGameIni(gameID: String?)

-    external fun setAppDirectory(directory: String)
+    /**
+     * Gets the embedded icon within the given ROM.
+     *
+     * @param filename the file path to the ROM.
+     * @return a byte array containing the JPEG data for the icon.
+     */
+    external fun getIcon(filename: String): ByteArray

    /**
-     * Installs a nsp or xci file to nand
-     * @param filename String representation of file uri
-     * @param extension Lowercase string representation of file extension without "."
+     * Gets the embedded title of the given ISO/ROM.
+     *
+     * @param filename The file path to the ISO/ROM.
+     * @return the embedded title of the ISO/ROM.
     */
-    external fun installFileToNand(filename: String, extension: String): Int
+    external fun getTitle(filename: String): String
+
+    external fun getDescription(filename: String): String
+
+    external fun getGameId(filename: String): String
+
+    external fun getRegions(filename: String): String
+
+    external fun getCompany(filename: String): String
+
+    external fun isHomebrew(filename: String): Boolean
+
+    external fun setAppDirectory(directory: String)
+
+    external fun installFileToNand(filename: String): Int

    external fun initializeGpuDriver(
        hookLibDir: String?,
@@ -252,7 +258,7 @@ object NativeLibrary {

    external fun reloadKeys(): Boolean

-    external fun initializeSystem()
+    external fun initializeEmulation()

    external fun defaultCPUCore(): Int

@@ -286,6 +292,11 @@ object NativeLibrary {
     */
    external fun stopEmulation()

+    /**
+     * Resets the in-memory ROM metadata cache.
+     */
+    external fun resetRomMetadata()
+
    /**
     * Returns true if emulation is running (or is paused).
     */
@@ -462,12 +473,12 @@ object NativeLibrary {
    }

    fun setEmulationActivity(emulationActivity: EmulationActivity?) {
-        Log.debug("[NativeLibrary] Registering EmulationActivity.")
+        Log.verbose("[NativeLibrary] Registering EmulationActivity.")
        sEmulationActivity = WeakReference(emulationActivity)
    }

    fun clearEmulationActivity() {
-        Log.debug("[NativeLibrary] Unregistering EmulationActivity.")
+        Log.verbose("[NativeLibrary] Unregistering EmulationActivity.")
        sEmulationActivity.clear()
    }

@@ -500,41 +511,6 @@ object NativeLibrary {
     */
    external fun submitInlineKeyboardInput(key_code: Int)

-    /**
-     * Creates a generic user directory if it doesn't exist already
-     */
-    external fun initializeEmptyUserDirectory()
-
-    /**
-     * Gets the launch path for a given applet. It is the caller's responsibility to also
-     * set the system's current applet ID before trying to launch the nca given by this function.
-     *
-     * @param id The applet entry ID
-     * @return The applet's launch path
-     */
-    external fun getAppletLaunchPath(id: Long): String
-
-    /**
-     * Sets the system's current applet ID before launching.
-     *
-     * @param appletId One of the ids in the Service::AM::Applets::AppletId enum
-     */
-    external fun setCurrentAppletId(appletId: Int)
-
-    /**
-     * Sets the cabinet mode for launching the cabinet applet.
-     *
-     * @param cabinetMode One of the modes that corresponds to the enum in Service::NFP::CabinetMode
-     */
-    external fun setCabinetMode(cabinetMode: Int)
-
-    /**
-     * Checks whether NAND contents are available and valid.
-     *
-     * @return 'true' if firmware is available
-     */
-    external fun isFirmwareAvailable(): Boolean
-
    /**
     * Button type for use in onTouchEvent
     */
@@ -47,7 +47,7 @@ class YuzuApplication : Application() {
        application = this
        documentsTree = DocumentsTree()
        DirectoryInitialization.start()
-        GpuDriverHelper.initializeDriverParameters()
+        GpuDriverHelper.initializeDriverParameters(applicationContext)
        NativeLibrary.logDeviceInfo()

        createNotificationChannels()
@@ -45,9 +45,9 @@ import org.yuzu.yuzu_emu.features.settings.model.IntSetting
 import org.yuzu.yuzu_emu.features.settings.model.Settings
 import org.yuzu.yuzu_emu.model.EmulationViewModel
 import org.yuzu.yuzu_emu.model.Game
+import org.yuzu.yuzu_emu.utils.ControllerMappingHelper
 import org.yuzu.yuzu_emu.utils.ForegroundService
 import org.yuzu.yuzu_emu.utils.InputHandler
-import org.yuzu.yuzu_emu.utils.Log
 import org.yuzu.yuzu_emu.utils.MemoryUtil
 import org.yuzu.yuzu_emu.utils.NfcReader
 import org.yuzu.yuzu_emu.utils.ThemeHelper
@@ -57,16 +57,17 @@ import kotlin.math.roundToInt
 class EmulationActivity : AppCompatActivity(), SensorEventListener {
    private lateinit var binding: ActivityEmulationBinding

+    private var controllerMappingHelper: ControllerMappingHelper? = null
+
    var isActivityRecreated = false
    private lateinit var nfcReader: NfcReader
+    private lateinit var inputHandler: InputHandler

    private val gyro = FloatArray(3)
    private val accel = FloatArray(3)
    private var motionTimestamp: Long = 0
    private var flipMotionOrientation: Boolean = false

-    private var controllerIds = InputHandler.getGameControllerIds()
-
    private val actionPause = "ACTION_EMULATOR_PAUSE"
    private val actionPlay = "ACTION_EMULATOR_PLAY"
    private val actionMute = "ACTION_EMULATOR_MUTE"
@@ -81,7 +82,6 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener {
    }

    override fun onCreate(savedInstanceState: Bundle?) {
-        Log.gameLaunched = true
        ThemeHelper.setTheme(this)

        super.onCreate(savedInstanceState)
@@ -95,6 +95,8 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener {

        isActivityRecreated = savedInstanceState != null

+        controllerMappingHelper = ControllerMappingHelper()
+
        // Set these options now so that the SurfaceView the game renders into is the right size.
        enableFullscreenImmersive()

@@ -103,7 +105,8 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener {
        nfcReader = NfcReader(this)
        nfcReader.initialize()

-        InputHandler.initialize()
+        inputHandler = InputHandler()
+        inputHandler.initialize()

        val preferences = PreferenceManager.getDefaultSharedPreferences(YuzuApplication.appContext)
        if (!preferences.getBoolean(Settings.PREF_MEMORY_WARNING_SHOWN, false)) {
@@ -159,7 +162,6 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener {
        super.onResume()
        nfcReader.startScanning()
        startMotionSensorListener()
-        InputHandler.updateControllerIds()

        buildPictureInPictureParams()
    }
@@ -193,7 +195,7 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener {
            return super.dispatchKeyEvent(event)
        }

-        return InputHandler.dispatchKeyEvent(event)
+        return inputHandler.dispatchKeyEvent(event)
    }

    override fun dispatchGenericMotionEvent(event: MotionEvent): Boolean {
@@ -208,7 +210,7 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener {
            return true
        }

-        return InputHandler.dispatchGenericMotionEvent(event)
+        return inputHandler.dispatchGenericMotionEvent(event)
    }

    override fun onSensorChanged(event: SensorEvent) {
@@ -1,90 +0,0 @@
-// 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 android.widget.Toast
-import androidx.core.content.res.ResourcesCompat
-import androidx.fragment.app.FragmentActivity
-import androidx.navigation.findNavController
-import androidx.recyclerview.widget.RecyclerView
-import org.yuzu.yuzu_emu.HomeNavigationDirections
-import org.yuzu.yuzu_emu.NativeLibrary
-import org.yuzu.yuzu_emu.R
-import org.yuzu.yuzu_emu.YuzuApplication
-import org.yuzu.yuzu_emu.databinding.CardAppletOptionBinding
-import org.yuzu.yuzu_emu.model.Applet
-import org.yuzu.yuzu_emu.model.AppletInfo
-import org.yuzu.yuzu_emu.model.Game
-
-class AppletAdapter(val activity: FragmentActivity, var applets: List<Applet>) :
-    RecyclerView.Adapter<AppletAdapter.AppletViewHolder>(),
-    View.OnClickListener {
-
-    override fun onCreateViewHolder(
-        parent: ViewGroup,
-        viewType: Int
-    ): AppletAdapter.AppletViewHolder {
-        CardAppletOptionBinding.inflate(LayoutInflater.from(parent.context), parent, false)
-            .apply { root.setOnClickListener(this@AppletAdapter) }
-            .also { return AppletViewHolder(it) }
-    }
-
-    override fun onBindViewHolder(holder: AppletViewHolder, position: Int) =
-        holder.bind(applets[position])
-
-    override fun getItemCount(): Int = applets.size
-
-    override fun onClick(view: View) {
-        val applet = (view.tag as AppletViewHolder).applet
-        val appletPath = NativeLibrary.getAppletLaunchPath(applet.appletInfo.entryId)
-        if (appletPath.isEmpty()) {
-            Toast.makeText(
-                YuzuApplication.appContext,
-                R.string.applets_error_applet,
-                Toast.LENGTH_SHORT
-            ).show()
-            return
-        }
-
-        if (applet.appletInfo == AppletInfo.Cabinet) {
-            view.findNavController()
-                .navigate(R.id.action_appletLauncherFragment_to_cabinetLauncherDialogFragment)
-            return
-        }
-
-        NativeLibrary.setCurrentAppletId(applet.appletInfo.appletId)
-        val appletGame = Game(
-            title = YuzuApplication.appContext.getString(applet.titleId),
-            path = appletPath
-        )
-        val action = HomeNavigationDirections.actionGlobalEmulationActivity(appletGame)
-        view.findNavController().navigate(action)
-    }
-
-    inner class AppletViewHolder(val binding: CardAppletOptionBinding) :
-        RecyclerView.ViewHolder(binding.root) {
-        lateinit var applet: Applet
-
-        init {
-            itemView.tag = this
-        }
-
-        fun bind(applet: Applet) {
-            this.applet = applet
-
-            binding.title.setText(applet.titleId)
-            binding.description.setText(applet.descriptionId)
-            binding.icon.setImageDrawable(
-                ResourcesCompat.getDrawable(
-                    binding.icon.context.resources,
-                    applet.iconId,
-                    binding.icon.context.theme
-                )
-            )
-        }
-    }
-}
@@ -1,72 +0,0 @@
-// 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.core.content.res.ResourcesCompat
-import androidx.fragment.app.Fragment
-import androidx.navigation.fragment.findNavController
-import androidx.recyclerview.widget.RecyclerView
-import org.yuzu.yuzu_emu.HomeNavigationDirections
-import org.yuzu.yuzu_emu.NativeLibrary
-import org.yuzu.yuzu_emu.R
-import org.yuzu.yuzu_emu.YuzuApplication
-import org.yuzu.yuzu_emu.databinding.DialogListItemBinding
-import org.yuzu.yuzu_emu.model.CabinetMode
-import org.yuzu.yuzu_emu.adapters.CabinetLauncherDialogAdapter.CabinetModeViewHolder
-import org.yuzu.yuzu_emu.model.AppletInfo
-import org.yuzu.yuzu_emu.model.Game
-
-class CabinetLauncherDialogAdapter(val fragment: Fragment) :
-    RecyclerView.Adapter<CabinetModeViewHolder>(),
-    View.OnClickListener {
-    private val cabinetModes = CabinetMode.values().copyOfRange(1, CabinetMode.values().size)
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): CabinetModeViewHolder {
-        DialogListItemBinding.inflate(LayoutInflater.from(parent.context), parent, false)
-            .apply { root.setOnClickListener(this@CabinetLauncherDialogAdapter) }
-            .also { return CabinetModeViewHolder(it) }
-    }
-
-    override fun getItemCount(): Int = cabinetModes.size
-
-    override fun onBindViewHolder(holder: CabinetModeViewHolder, position: Int) =
-        holder.bind(cabinetModes[position])
-
-    override fun onClick(view: View) {
-        val mode = (view.tag as CabinetModeViewHolder).cabinetMode
-        val appletPath = NativeLibrary.getAppletLaunchPath(AppletInfo.Cabinet.entryId)
-        NativeLibrary.setCurrentAppletId(AppletInfo.Cabinet.appletId)
-        NativeLibrary.setCabinetMode(mode.id)
-        val appletGame = Game(
-            title = YuzuApplication.appContext.getString(R.string.cabinet_applet),
-            path = appletPath
-        )
-        val action = HomeNavigationDirections.actionGlobalEmulationActivity(appletGame)
-        fragment.findNavController().navigate(action)
-    }
-
-    inner class CabinetModeViewHolder(val binding: DialogListItemBinding) :
-        RecyclerView.ViewHolder(binding.root) {
-        lateinit var cabinetMode: CabinetMode
-
-        init {
-            itemView.tag = this
-        }
-
-        fun bind(cabinetMode: CabinetMode) {
-            this.cabinetMode = cabinetMode
-            binding.icon.setImageDrawable(
-                ResourcesCompat.getDrawable(
-                    binding.icon.context.resources,
-                    cabinetMode.iconId,
-                    binding.icon.context.theme
-                )
-            )
-            binding.title.setText(cabinetMode.titleId)
-        }
-    }
-}
@@ -1,117 +0,0 @@
-// SPDX-FileCopyrightText: 2023 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-package org.yuzu.yuzu_emu.adapters
-
-import android.text.TextUtils
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.recyclerview.widget.AsyncDifferConfig
-import androidx.recyclerview.widget.DiffUtil
-import androidx.recyclerview.widget.ListAdapter
-import androidx.recyclerview.widget.RecyclerView
-import org.yuzu.yuzu_emu.R
-import org.yuzu.yuzu_emu.databinding.CardDriverOptionBinding
-import org.yuzu.yuzu_emu.model.DriverViewModel
-import org.yuzu.yuzu_emu.utils.GpuDriverHelper
-import org.yuzu.yuzu_emu.utils.GpuDriverMetadata
-
-class DriverAdapter(private val driverViewModel: DriverViewModel) :
-    ListAdapter<Pair<String, GpuDriverMetadata>, DriverAdapter.DriverViewHolder>(
-        AsyncDifferConfig.Builder(DiffCallback()).build()
-    ) {
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): DriverViewHolder {
-        val binding =
-            CardDriverOptionBinding.inflate(LayoutInflater.from(parent.context), parent, false)
-        return DriverViewHolder(binding)
-    }
-
-    override fun getItemCount(): Int = currentList.size
-
-    override fun onBindViewHolder(holder: DriverViewHolder, position: Int) =
-        holder.bind(currentList[position])
-
-    private fun onSelectDriver(position: Int) {
-        driverViewModel.setSelectedDriverIndex(position)
-        notifyItemChanged(driverViewModel.previouslySelectedDriver)
-        notifyItemChanged(driverViewModel.selectedDriver)
-    }
-
-    private fun onDeleteDriver(driverData: Pair<String, GpuDriverMetadata>, position: Int) {
-        if (driverViewModel.selectedDriver > position) {
-            driverViewModel.setSelectedDriverIndex(driverViewModel.selectedDriver - 1)
-        }
-        if (GpuDriverHelper.customDriverData == driverData.second) {
-            driverViewModel.setSelectedDriverIndex(0)
-        }
-        driverViewModel.driversToDelete.add(driverData.first)
-        driverViewModel.removeDriver(driverData)
-        notifyItemRemoved(position)
-        notifyItemChanged(driverViewModel.selectedDriver)
-    }
-
-    inner class DriverViewHolder(val binding: CardDriverOptionBinding) :
-        RecyclerView.ViewHolder(binding.root) {
-        private lateinit var driverData: Pair<String, GpuDriverMetadata>
-
-        fun bind(driverData: Pair<String, GpuDriverMetadata>) {
-            this.driverData = driverData
-            val driver = driverData.second
-
-            binding.apply {
-                radioButton.isChecked = driverViewModel.selectedDriver == bindingAdapterPosition
-                root.setOnClickListener {
-                    onSelectDriver(bindingAdapterPosition)
-                }
-                buttonDelete.setOnClickListener {
-                    onDeleteDriver(driverData, bindingAdapterPosition)
-                }
-
-                // Delay marquee by 3s
-                title.postDelayed(
-                    {
-                        title.isSelected = true
-                        title.ellipsize = TextUtils.TruncateAt.MARQUEE
-                        version.isSelected = true
-                        version.ellipsize = TextUtils.TruncateAt.MARQUEE
-                        description.isSelected = true
-                        description.ellipsize = TextUtils.TruncateAt.MARQUEE
-                    },
-                    3000
-                )
-                if (driver.name == null) {
-                    title.setText(R.string.system_gpu_driver)
-                    description.text = ""
-                    version.text = ""
-                    version.visibility = View.GONE
-                    description.visibility = View.GONE
-                    buttonDelete.visibility = View.GONE
-                } else {
-                    title.text = driver.name
-                    version.text = driver.version
-                    description.text = driver.description
-                    version.visibility = View.VISIBLE
-                    description.visibility = View.VISIBLE
-                    buttonDelete.visibility = View.VISIBLE
-                }
-            }
-        }
-    }
-
-    private class DiffCallback : DiffUtil.ItemCallback<Pair<String, GpuDriverMetadata>>() {
-        override fun areItemsTheSame(
-            oldItem: Pair<String, GpuDriverMetadata>,
-            newItem: Pair<String, GpuDriverMetadata>
-        ): Boolean {
-            return oldItem.first == newItem.first
-        }
-
-        override fun areContentsTheSame(
-            oldItem: Pair<String, GpuDriverMetadata>,
-            newItem: Pair<String, GpuDriverMetadata>
-        ): Boolean {
-            return oldItem.second == newItem.second
-        }
-    }
-}
@@ -147,7 +147,7 @@ class GameAdapter(private val activity: AppCompatActivity) :

    private class DiffCallback : DiffUtil.ItemCallback<Game>() {
        override fun areItemsTheSame(oldItem: Game, newItem: Game): Boolean {
-            return oldItem.programId == newItem.programId
+            return oldItem.gameId == newItem.gameId
        }

        override fun areContentsTheSame(oldItem: Game, newItem: Game): Boolean {
@@ -1,49 +0,0 @@
-// 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() }
-            }
-        }
-    }
-}
@@ -21,7 +21,6 @@ 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
@@ -169,7 +168,7 @@ class SettingsActivity : AppCompatActivity() {
        if (!settingsFile.delete()) {
            throw IOException("Failed to delete $settingsFile")
        }
-        NativeLibrary.reloadSettings()
+        Settings.settingsList.forEach { it.reset() }

        Toast.makeText(
            applicationContext,
@@ -182,14 +181,12 @@ class SettingsActivity : AppCompatActivity() {
    private fun setInsets() {
        ViewCompat.setOnApplyWindowInsetsListener(
            binding.navigationBarShade
-        ) { _: View, windowInsets: WindowInsetsCompat ->
+        ) { view: View, windowInsets: WindowInsetsCompat ->
            val barInsets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars())

-            // The only situation where we care to have a nav bar shade is when it's at the bottom
-            // of the screen where scrolling list elements can go behind it.
-            val mlpNavShade = binding.navigationBarShade.layoutParams as MarginLayoutParams
-            mlpNavShade.height = barInsets.bottom
-            binding.navigationBarShade.layoutParams = mlpNavShade
+            val mlpShade = view.layoutParams as MarginLayoutParams
+            mlpShade.height = barInsets.bottom
+            view.layoutParams = mlpShade

            windowInsets
        }
@@ -26,6 +26,7 @@ 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
@@ -92,6 +93,12 @@ 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)) }
@@ -1,113 +0,0 @@
-// 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.AppletAdapter
-import org.yuzu.yuzu_emu.databinding.FragmentAppletLauncherBinding
-import org.yuzu.yuzu_emu.model.Applet
-import org.yuzu.yuzu_emu.model.AppletInfo
-import org.yuzu.yuzu_emu.model.HomeViewModel
-
-class AppletLauncherFragment : Fragment() {
-    private var _binding: FragmentAppletLauncherBinding? = 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 = FragmentAppletLauncherBinding.inflate(inflater)
-        return binding.root
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        homeViewModel.setNavigationVisibility(visible = false, animated = true)
-        homeViewModel.setStatusBarShadeVisibility(visible = false)
-
-        binding.toolbarApplets.setNavigationOnClickListener {
-            binding.root.findNavController().popBackStack()
-        }
-
-        val applets = listOf(
-            Applet(
-                R.string.album_applet,
-                R.string.album_applet_description,
-                R.drawable.ic_album,
-                AppletInfo.PhotoViewer
-            ),
-            Applet(
-                R.string.cabinet_applet,
-                R.string.cabinet_applet_description,
-                R.drawable.ic_nfc,
-                AppletInfo.Cabinet
-            ),
-            Applet(
-                R.string.mii_edit_applet,
-                R.string.mii_edit_applet_description,
-                R.drawable.ic_mii,
-                AppletInfo.MiiEdit
-            )
-        )
-
-        binding.listApplets.apply {
-            layoutManager = GridLayoutManager(
-                requireContext(),
-                resources.getInteger(R.integer.grid_columns)
-            )
-            adapter = AppletAdapter(requireActivity(), applets)
-        }
-
-        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.toolbarApplets.layoutParams as ViewGroup.MarginLayoutParams
-            mlpAppBar.leftMargin = leftInsets
-            mlpAppBar.rightMargin = rightInsets
-            binding.toolbarApplets.layoutParams = mlpAppBar
-
-            val mlpListApplets =
-                binding.listApplets.layoutParams as ViewGroup.MarginLayoutParams
-            mlpListApplets.leftMargin = leftInsets
-            mlpListApplets.rightMargin = rightInsets
-            binding.listApplets.layoutParams = mlpListApplets
-
-            binding.listApplets.updatePadding(bottom = barInsets.bottom)
-
-            windowInsets
-        }
-}
@@ -1,41 +0,0 @@
-// SPDX-FileCopyrightText: 2023 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-package org.yuzu.yuzu_emu.fragments
-
-import android.app.Dialog
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.fragment.app.DialogFragment
-import androidx.recyclerview.widget.LinearLayoutManager
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import org.yuzu.yuzu_emu.R
-import org.yuzu.yuzu_emu.adapters.CabinetLauncherDialogAdapter
-import org.yuzu.yuzu_emu.databinding.DialogListBinding
-
-class CabinetLauncherDialogFragment : DialogFragment() {
-    private lateinit var binding: DialogListBinding
-
-    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-        binding = DialogListBinding.inflate(layoutInflater)
-        binding.dialogList.apply {
-            layoutManager = LinearLayoutManager(requireContext())
-            adapter = CabinetLauncherDialogAdapter(this@CabinetLauncherDialogFragment)
-        }
-
-        return MaterialAlertDialogBuilder(requireContext())
-            .setTitle(R.string.cabinet_launcher)
-            .setView(binding.root)
-            .create()
-    }
-
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View {
-        return binding.root
-    }
-}
@@ -1,186 +0,0 @@
-// 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.activity.result.contract.ActivityResultContracts
-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.lifecycle.lifecycleScope
-import androidx.navigation.findNavController
-import androidx.recyclerview.widget.GridLayoutManager
-import com.google.android.material.transition.MaterialSharedAxis
-import kotlinx.coroutines.flow.collectLatest
-import kotlinx.coroutines.launch
-import org.yuzu.yuzu_emu.R
-import org.yuzu.yuzu_emu.adapters.DriverAdapter
-import org.yuzu.yuzu_emu.databinding.FragmentDriverManagerBinding
-import org.yuzu.yuzu_emu.model.DriverViewModel
-import org.yuzu.yuzu_emu.model.HomeViewModel
-import org.yuzu.yuzu_emu.utils.FileUtil
-import org.yuzu.yuzu_emu.utils.GpuDriverHelper
-import java.io.File
-import java.io.IOException
-
-class DriverManagerFragment : Fragment() {
-    private var _binding: FragmentDriverManagerBinding? = null
-    private val binding get() = _binding!!
-
-    private val homeViewModel: HomeViewModel by activityViewModels()
-    private val driverViewModel: DriverViewModel 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 = FragmentDriverManagerBinding.inflate(inflater)
-        return binding.root
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        homeViewModel.setNavigationVisibility(visible = false, animated = true)
-        homeViewModel.setStatusBarShadeVisibility(visible = false)
-
-        if (!driverViewModel.isInteractionAllowed) {
-            DriversLoadingDialogFragment().show(
-                childFragmentManager,
-                DriversLoadingDialogFragment.TAG
-            )
-        }
-
-        binding.toolbarDrivers.setNavigationOnClickListener {
-            binding.root.findNavController().popBackStack()
-        }
-
-        binding.buttonInstall.setOnClickListener {
-            getDriver.launch(arrayOf("application/zip"))
-        }
-
-        binding.listDrivers.apply {
-            layoutManager = GridLayoutManager(
-                requireContext(),
-                resources.getInteger(R.integer.grid_columns)
-            )
-            adapter = DriverAdapter(driverViewModel)
-        }
-
-        viewLifecycleOwner.lifecycleScope.apply {
-            launch {
-                driverViewModel.driverList.collectLatest {
-                    (binding.listDrivers.adapter as DriverAdapter).submitList(it)
-                }
-            }
-            launch {
-                driverViewModel.newDriverInstalled.collect {
-                    if (_binding != null && it) {
-                        (binding.listDrivers.adapter as DriverAdapter).apply {
-                            notifyItemChanged(driverViewModel.previouslySelectedDriver)
-                            notifyItemChanged(driverViewModel.selectedDriver)
-                            driverViewModel.setNewDriverInstalled(false)
-                        }
-                    }
-                }
-            }
-        }
-
-        setInsets()
-    }
-
-    // Start installing requested driver
-    override fun onStop() {
-        super.onStop()
-        driverViewModel.onCloseDriverManager()
-    }
-
-    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.toolbarDrivers.layoutParams as ViewGroup.MarginLayoutParams
-            mlpAppBar.leftMargin = leftInsets
-            mlpAppBar.rightMargin = rightInsets
-            binding.toolbarDrivers.layoutParams = mlpAppBar
-
-            val mlplistDrivers = binding.listDrivers.layoutParams as ViewGroup.MarginLayoutParams
-            mlplistDrivers.leftMargin = leftInsets
-            mlplistDrivers.rightMargin = rightInsets
-            binding.listDrivers.layoutParams = mlplistDrivers
-
-            val fabSpacing = resources.getDimensionPixelSize(R.dimen.spacing_fab)
-            val mlpFab =
-                binding.buttonInstall.layoutParams as ViewGroup.MarginLayoutParams
-            mlpFab.leftMargin = leftInsets + fabSpacing
-            mlpFab.rightMargin = rightInsets + fabSpacing
-            mlpFab.bottomMargin = barInsets.bottom + fabSpacing
-            binding.buttonInstall.layoutParams = mlpFab
-
-            binding.listDrivers.updatePadding(
-                bottom = barInsets.bottom +
-                    resources.getDimensionPixelSize(R.dimen.spacing_bottom_list_fab)
-            )
-
-            windowInsets
-        }
-
-    private val getDriver =
-        registerForActivityResult(ActivityResultContracts.OpenDocument()) { result ->
-            if (result == null) {
-                return@registerForActivityResult
-            }
-
-            IndeterminateProgressDialogFragment.newInstance(
-                requireActivity(),
-                R.string.installing_driver,
-                false
-            ) {
-                val driverPath =
-                    "${GpuDriverHelper.driverStoragePath}/${FileUtil.getFilename(result)}"
-                val driverFile = File(driverPath)
-
-                // Ignore file exceptions when a user selects an invalid zip
-                try {
-                    if (!GpuDriverHelper.copyDriverToInternalStorage(result)) {
-                        throw IOException("Driver failed validation!")
-                    }
-                } catch (_: IOException) {
-                    if (driverFile.exists()) {
-                        driverFile.delete()
-                    }
-                    return@newInstance getString(R.string.select_gpu_driver_error)
-                }
-
-                val driverData = GpuDriverHelper.getMetadataFromZip(driverFile)
-                val driverInList =
-                    driverViewModel.driverList.value.firstOrNull { it.second == driverData }
-                if (driverInList != null) {
-                    return@newInstance getString(R.string.driver_already_installed)
-                } else {
-                    driverViewModel.addDriver(Pair(driverPath, driverData))
-                    driverViewModel.setNewDriverInstalled(true)
-                }
-                return@newInstance Any()
-            }.show(childFragmentManager, IndeterminateProgressDialogFragment.TAG)
-        }
-}
@@ -1,75 +0,0 @@
-// SPDX-FileCopyrightText: 2023 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-package org.yuzu.yuzu_emu.fragments
-
-import android.app.Dialog
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.fragment.app.DialogFragment
-import androidx.fragment.app.activityViewModels
-import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.lifecycleScope
-import androidx.lifecycle.repeatOnLifecycle
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import kotlinx.coroutines.launch
-import org.yuzu.yuzu_emu.R
-import org.yuzu.yuzu_emu.databinding.DialogProgressBarBinding
-import org.yuzu.yuzu_emu.model.DriverViewModel
-
-class DriversLoadingDialogFragment : DialogFragment() {
-    private val driverViewModel: DriverViewModel by activityViewModels()
-
-    private lateinit var binding: DialogProgressBarBinding
-
-    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-        binding = DialogProgressBarBinding.inflate(layoutInflater)
-        binding.progressBar.isIndeterminate = true
-
-        isCancelable = false
-
-        return MaterialAlertDialogBuilder(requireContext())
-            .setTitle(R.string.loading)
-            .setView(binding.root)
-            .create()
-    }
-
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View = binding.root
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        viewLifecycleOwner.lifecycleScope.apply {
-            launch {
-                repeatOnLifecycle(Lifecycle.State.RESUMED) {
-                    driverViewModel.areDriversLoading.collect { checkForDismiss() }
-                }
-            }
-            launch {
-                repeatOnLifecycle(Lifecycle.State.RESUMED) {
-                    driverViewModel.isDriverReady.collect { checkForDismiss() }
-                }
-            }
-            launch {
-                repeatOnLifecycle(Lifecycle.State.RESUMED) {
-                    driverViewModel.isDeletingDrivers.collect { checkForDismiss() }
-                }
-            }
-        }
-    }
-
-    private fun checkForDismiss() {
-        if (driverViewModel.isInteractionAllowed) {
-            dismiss()
-        }
-    }
-
-    companion object {
-        const val TAG = "DriversLoadingDialogFragment"
-    }
-}
@@ -15,10 +15,8 @@ import android.net.Uri
 import android.os.Bundle
 import android.os.Handler
 import android.os.Looper
-import android.os.SystemClock
 import android.view.*
 import android.widget.TextView
-import android.widget.Toast
 import androidx.activity.OnBackPressedCallback
 import androidx.appcompat.widget.PopupMenu
 import androidx.core.content.res.ResourcesCompat
@@ -26,7 +24,6 @@ import androidx.core.graphics.Insets
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowInsetsCompat
 import androidx.drawerlayout.widget.DrawerLayout
-import androidx.drawerlayout.widget.DrawerLayout.DrawerListener
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import androidx.lifecycle.Lifecycle
@@ -41,7 +38,6 @@ import androidx.window.layout.WindowLayoutInfo
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.slider.Slider
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.launch
 import org.yuzu.yuzu_emu.HomeNavigationDirections
@@ -53,12 +49,10 @@ import org.yuzu.yuzu_emu.databinding.DialogOverlayAdjustBinding
 import org.yuzu.yuzu_emu.databinding.FragmentEmulationBinding
 import org.yuzu.yuzu_emu.features.settings.model.IntSetting
 import org.yuzu.yuzu_emu.features.settings.model.Settings
-import org.yuzu.yuzu_emu.model.DriverViewModel
 import org.yuzu.yuzu_emu.model.Game
 import org.yuzu.yuzu_emu.model.EmulationViewModel
 import org.yuzu.yuzu_emu.overlay.InputOverlay
 import org.yuzu.yuzu_emu.utils.*
-import java.lang.NullPointerException

 class EmulationFragment : Fragment(), SurfaceHolder.Callback {
    private lateinit var preferences: SharedPreferences
@@ -74,7 +68,6 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
    private lateinit var game: Game

    private val emulationViewModel: EmulationViewModel by activityViewModels()
-    private val driverViewModel: DriverViewModel by activityViewModels()

    private var isInFoldableLayout = false

@@ -111,21 +104,10 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
                null
            }
        }
-
-        try {
-            game = if (args.game != null) {
-                args.game!!
-            } else {
-                intentGame!!
-            }
-        } catch (e: NullPointerException) {
-            Toast.makeText(
-                requireContext(),
-                R.string.no_game_present,
-                Toast.LENGTH_SHORT
-            ).show()
-            requireActivity().finish()
-            return
+        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.
@@ -149,41 +131,10 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
    // This is using the correct scope, lint is just acting up
    @SuppressLint("UnsafeRepeatOnLifecycleDetector")
    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        if (requireActivity().isFinishing) {
-            return
-        }
-
        binding.surfaceEmulation.holder.addCallback(this)
        binding.showFpsText.setTextColor(Color.YELLOW)
        binding.doneControlConfig.setOnClickListener { stopConfiguringControls() }

-        binding.drawerLayout.addDrawerListener(object : DrawerListener {
-            override fun onDrawerSlide(drawerView: View, slideOffset: Float) {
-                binding.surfaceInputOverlay.dispatchTouchEvent(
-                    MotionEvent.obtain(
-                        SystemClock.uptimeMillis(),
-                        SystemClock.uptimeMillis() + 100,
-                        MotionEvent.ACTION_UP,
-                        0f,
-                        0f,
-                        0
-                    )
-                )
-            }
-
-            override fun onDrawerOpened(drawerView: View) {
-                // No op
-            }
-
-            override fun onDrawerClosed(drawerView: View) {
-                // No op
-            }
-
-            override fun onDrawerStateChanged(newState: Int) {
-                // No op
-            }
-        })
        binding.drawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED)
        binding.inGameMenu.getHeaderView(0).findViewById<TextView>(R.id.text_game_title).text =
            game.title
@@ -312,8 +263,6 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
                            ViewUtils.showView(binding.surfaceInputOverlay)
                            ViewUtils.hideView(binding.loadingIndicator)

-                            emulationState.updateSurface()
-
                            // Setup overlay
                            updateShowFpsOverlay()
                        }
@@ -332,43 +281,30 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
                    }
                }
            }
-            launch {
-                repeatOnLifecycle(Lifecycle.State.RESUMED) {
-                    driverViewModel.isDriverReady.collect {
-                        if (it && !emulationState.isRunning) {
-                            if (!DirectoryInitialization.areDirectoriesReady) {
-                                DirectoryInitialization.start()
-                            }
-
-                            updateScreenLayout()
-
-                            emulationState.run(emulationActivity!!.isActivityRecreated)
-                        }
-                    }
-                }
-            }
        }
    }

    override fun onConfigurationChanged(newConfig: Configuration) {
        super.onConfigurationChanged(newConfig)
-        if (_binding == null) {
-            return
-        }
-
        updateScreenLayout()
        if (emulationActivity?.isInPictureInPictureMode == true) {
            if (binding.drawerLayout.isOpen) {
                binding.drawerLayout.close()
            }
            if (EmulationMenuSettings.showOverlay) {
-                binding.surfaceInputOverlay.visibility = View.INVISIBLE
+                binding.surfaceInputOverlay.post {
+                    binding.surfaceInputOverlay.visibility = View.INVISIBLE
+                }
            }
        } else {
            if (EmulationMenuSettings.showOverlay && emulationViewModel.emulationStarted.value) {
-                binding.surfaceInputOverlay.visibility = View.VISIBLE
+                binding.surfaceInputOverlay.post {
+                    binding.surfaceInputOverlay.visibility = View.VISIBLE
+                }
            } else {
-                binding.surfaceInputOverlay.visibility = View.INVISIBLE
+                binding.surfaceInputOverlay.post {
+                    binding.surfaceInputOverlay.visibility = View.INVISIBLE
+                }
            }
            if (!isInFoldableLayout) {
                if (newConfig.orientation == Configuration.ORIENTATION_PORTRAIT) {
@@ -380,6 +316,17 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
        }
    }

+    override fun onResume() {
+        super.onResume()
+        if (!DirectoryInitialization.areDirectoriesReady) {
+            DirectoryInitialization.start()
+        }
+
+        updateScreenLayout()
+
+        emulationState.run(emulationActivity!!.isActivityRecreated)
+    }
+
    override fun onPause() {
        if (emulationState.isRunning && emulationActivity?.isInPictureInPictureMode != true) {
            emulationState.pause()
@@ -806,13 +753,6 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
            }
        }

-        @Synchronized
-        fun updateSurface() {
-            if (surface != null) {
-                NativeLibrary.surfaceChanged(surface)
-            }
-        }
-
        @Synchronized
        fun clearSurface() {
            if (surface == null) {
@@ -5,6 +5,7 @@ package org.yuzu.yuzu_emu.fragments

 import android.Manifest
 import android.content.ActivityNotFoundException
+import android.content.DialogInterface
 import android.content.Intent
 import android.content.pm.PackageManager
 import android.os.Bundle
@@ -26,23 +27,21 @@ import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import androidx.navigation.findNavController
 import androidx.navigation.fragment.findNavController
-import androidx.recyclerview.widget.GridLayoutManager
+import androidx.recyclerview.widget.LinearLayoutManager
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.transition.MaterialSharedAxis
 import org.yuzu.yuzu_emu.BuildConfig
 import org.yuzu.yuzu_emu.HomeNavigationDirections
-import org.yuzu.yuzu_emu.NativeLibrary
 import org.yuzu.yuzu_emu.R
 import org.yuzu.yuzu_emu.adapters.HomeSettingAdapter
 import org.yuzu.yuzu_emu.databinding.FragmentHomeSettingsBinding
 import org.yuzu.yuzu_emu.features.DocumentProvider
 import org.yuzu.yuzu_emu.features.settings.model.Settings
-import org.yuzu.yuzu_emu.model.DriverViewModel
 import org.yuzu.yuzu_emu.model.HomeSetting
 import org.yuzu.yuzu_emu.model.HomeViewModel
 import org.yuzu.yuzu_emu.ui.main.MainActivity
 import org.yuzu.yuzu_emu.utils.FileUtil
 import org.yuzu.yuzu_emu.utils.GpuDriverHelper
-import org.yuzu.yuzu_emu.utils.Log

 class HomeSettingsFragment : Fragment() {
    private var _binding: FragmentHomeSettingsBinding? = null
@@ -51,7 +50,6 @@ class HomeSettingsFragment : Fragment() {
    private lateinit var mainActivity: MainActivity

    private val homeViewModel: HomeViewModel by activityViewModels()
-    private val driverViewModel: DriverViewModel by activityViewModels()

    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)
@@ -87,42 +85,51 @@ class HomeSettingsFragment : Fragment() {
            )
            add(
                HomeSetting(
-                    R.string.gpu_driver_manager,
-                    R.string.install_gpu_driver_description,
-                    R.drawable.ic_build,
+                    R.string.open_user_folder,
+                    R.string.open_user_folder_description,
+                    R.drawable.ic_folder_open,
+                    { openFileManager() }
+                )
+            )
+            add(
+                HomeSetting(
+                    R.string.preferences_theme,
+                    R.string.theme_and_color_description,
+                    R.drawable.ic_palette,
                    {
-                        binding.root.findNavController()
-                            .navigate(R.id.action_homeSettingsFragment_to_driverManagerFragment)
-                    },
+                        val action = HomeNavigationDirections.actionGlobalSettingsActivity(
+                            null,
+                            Settings.MenuTag.SECTION_THEME
+                        )
+                        binding.root.findNavController().navigate(action)
+                    }
+                )
+            )
+            add(
+                HomeSetting(
+                    R.string.install_gpu_driver,
+                    R.string.install_gpu_driver_description,
+                    R.drawable.ic_exit,
+                    { driverInstaller() },
                    { GpuDriverHelper.supportsCustomDriverLoading() },
                    R.string.custom_driver_not_supported,
-                    R.string.custom_driver_not_supported_description,
-                    driverViewModel.selectedDriverMetadata
+                    R.string.custom_driver_not_supported_description
                )
            )
            add(
                HomeSetting(
-                    R.string.applets,
-                    R.string.applets_description,
-                    R.drawable.ic_applet,
-                    {
-                        binding.root.findNavController()
-                            .navigate(R.id.action_homeSettingsFragment_to_appletLauncherFragment)
-                    },
-                    { NativeLibrary.isFirmwareAvailable() },
-                    R.string.applets_error_firmware,
-                    R.string.applets_error_description
+                    R.string.install_amiibo_keys,
+                    R.string.install_amiibo_keys_description,
+                    R.drawable.ic_nfc,
+                    { mainActivity.getAmiiboKey.launch(arrayOf("*/*")) }
                )
            )
            add(
                HomeSetting(
-                    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)
-                    }
+                    R.string.install_game_content,
+                    R.string.install_game_content_description,
+                    R.drawable.ic_system_update_alt,
+                    { mainActivity.installGameUpdate.launch(arrayOf("*/*")) }
                )
            )
            add(
@@ -141,6 +148,35 @@ 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,
@@ -149,28 +185,6 @@ class HomeSettingsFragment : Fragment() {
                    { shareLog() }
                )
            )
-            add(
-                HomeSetting(
-                    R.string.open_user_folder,
-                    R.string.open_user_folder_description,
-                    R.drawable.ic_folder_open,
-                    { openFileManager() }
-                )
-            )
-            add(
-                HomeSetting(
-                    R.string.preferences_theme,
-                    R.string.theme_and_color_description,
-                    R.drawable.ic_palette,
-                    {
-                        val action = HomeNavigationDirections.actionGlobalSettingsActivity(
-                            null,
-                            Settings.MenuTag.SECTION_THEME
-                        )
-                        binding.root.findNavController().navigate(action)
-                    }
-                )
-            )
            add(
                HomeSetting(
                    R.string.about,
@@ -202,8 +216,7 @@ class HomeSettingsFragment : Fragment() {
        }

        binding.homeSettingsList.apply {
-            layoutManager =
-                GridLayoutManager(requireContext(), resources.getInteger(R.integer.grid_columns))
+            layoutManager = LinearLayoutManager(requireContext())
            adapter = HomeSettingAdapter(
                requireActivity() as AppCompatActivity,
                viewLifecycleOwner,
@@ -313,32 +326,44 @@ class HomeSettingsFragment : Fragment() {
        }
    }

-    // Share the current log if we just returned from a game but share the old log
-    // if we just started the app and the old log exists.
+    private fun driverInstaller() {
+        // Get the driver name for the dialog message.
+        var driverName = GpuDriverHelper.customDriverName
+        if (driverName == null) {
+            driverName = getString(R.string.system_gpu_driver)
+        }
+
+        MaterialAlertDialogBuilder(requireContext())
+            .setTitle(getString(R.string.select_gpu_driver_title))
+            .setMessage(driverName)
+            .setNegativeButton(android.R.string.cancel, null)
+            .setNeutralButton(R.string.select_gpu_driver_default) { _: DialogInterface?, _: Int ->
+                GpuDriverHelper.installDefaultDriver(requireContext())
+                Toast.makeText(
+                    requireContext(),
+                    R.string.select_gpu_driver_use_default,
+                    Toast.LENGTH_SHORT
+                ).show()
+            }
+            .setPositiveButton(R.string.select_gpu_driver_install) { _: DialogInterface?, _: Int ->
+                mainActivity.getDriver.launch(arrayOf("application/zip"))
+            }
+            .show()
+    }
+
    private fun shareLog() {
-        val currentLog = DocumentFile.fromSingleUri(
+        val file = DocumentFile.fromSingleUri(
            mainActivity,
            DocumentsContract.buildDocumentUri(
                DocumentProvider.AUTHORITY,
                "${DocumentProvider.ROOT_ID}/log/yuzu_log.txt"
            )
        )!!
-        val oldLog = DocumentFile.fromSingleUri(
-            mainActivity,
-            DocumentsContract.buildDocumentUri(
-                DocumentProvider.AUTHORITY,
-                "${DocumentProvider.ROOT_ID}/log/yuzu_log.txt.old.txt"
-            )
-        )!!
-
-        val intent = Intent(Intent.ACTION_SEND)
-            .setDataAndType(currentLog.uri, FileUtil.TEXT_PLAIN)
-            .addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
-        if (!Log.gameLaunched && oldLog.exists()) {
-            intent.putExtra(Intent.EXTRA_STREAM, oldLog.uri)
-            startActivity(Intent.createChooser(intent, getText(R.string.share_log)))
-        } else if (currentLog.exists()) {
-            intent.putExtra(Intent.EXTRA_STREAM, currentLog.uri)
+        if (file.exists()) {
+            val intent = Intent(Intent.ACTION_SEND)
+                .setDataAndType(file.uri, FileUtil.TEXT_PLAIN)
+                .addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
+                .putExtra(Intent.EXTRA_STREAM, file.uri)
            startActivity(Intent.createChooser(intent, getText(R.string.share_log)))
        } else {
            Toast.makeText(
@@ -0,0 +1,214 @@
+// SPDX-FileCopyrightText: 2023 yuzu Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+package org.yuzu.yuzu_emu.fragments
+
+import android.app.Dialog
+import android.content.Intent
+import android.net.Uri
+import android.os.Bundle
+import android.provider.DocumentsContract
+import android.widget.Toast
+import androidx.activity.result.ActivityResultLauncher
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.appcompat.app.AppCompatActivity
+import androidx.documentfile.provider.DocumentFile
+import androidx.fragment.app.DialogFragment
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import java.io.BufferedOutputStream
+import java.io.File
+import java.io.FileOutputStream
+import java.io.FilenameFilter
+import java.time.LocalDateTime
+import java.time.format.DateTimeFormatter
+import java.util.zip.ZipEntry
+import java.util.zip.ZipOutputStream
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import org.yuzu.yuzu_emu.R
+import org.yuzu.yuzu_emu.YuzuApplication
+import org.yuzu.yuzu_emu.features.DocumentProvider
+import org.yuzu.yuzu_emu.getPublicFilesDir
+import org.yuzu.yuzu_emu.utils.FileUtil
+
+class ImportExportSavesFragment : DialogFragment() {
+    private val context = YuzuApplication.appContext
+    private val savesFolder =
+        "${context.getPublicFilesDir().canonicalPath}/nand/user/save/0000000000000000"
+
+    // Get first subfolder in saves folder (should be the user folder)
+    private val savesFolderRoot = File(savesFolder).listFiles()?.firstOrNull()?.canonicalPath ?: ""
+    private var lastZipCreated: File? = null
+
+    private lateinit var startForResultExportSave: ActivityResultLauncher<Intent>
+    private lateinit var documentPicker: ActivityResultLauncher<Array<String>>
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        val activity = requireActivity() as AppCompatActivity
+
+        val activityResultRegistry = requireActivity().activityResultRegistry
+        startForResultExportSave = activityResultRegistry.register(
+            "startForResultExportSaveKey",
+            ActivityResultContracts.StartActivityForResult()
+        ) {
+            File(context.getPublicFilesDir().canonicalPath, "temp").deleteRecursively()
+        }
+        documentPicker = activityResultRegistry.register(
+            "documentPickerKey",
+            ActivityResultContracts.OpenDocument()
+        ) {
+            it?.let { uri -> importSave(uri, activity) }
+        }
+    }
+
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+        return if (savesFolderRoot == "") {
+            MaterialAlertDialogBuilder(requireContext())
+                .setTitle(R.string.manage_save_data)
+                .setMessage(R.string.import_export_saves_no_profile)
+                .setPositiveButton(android.R.string.ok, null)
+                .show()
+        } else {
+            MaterialAlertDialogBuilder(requireContext())
+                .setTitle(R.string.manage_save_data)
+                .setMessage(R.string.manage_save_data_description)
+                .setNegativeButton(R.string.export_saves) { _, _ ->
+                    exportSave()
+                }
+                .setPositiveButton(R.string.import_saves) { _, _ ->
+                    documentPicker.launch(arrayOf("application/zip"))
+                }
+                .setNeutralButton(android.R.string.cancel, null)
+                .show()
+        }
+    }
+
+    /**
+     * 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(requireContext().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()
+            ZipOutputStream(BufferedOutputStream(FileOutputStream(outputZipFile))).use { zos ->
+                saveFolder.walkTopDown().forEach { file ->
+                    val zipFileName =
+                        file.absolutePath.removePrefix(savesFolderRoot).removePrefix("/")
+                    if (zipFileName == "") {
+                        return@forEach
+                    }
+                    val entry = ZipEntry("$zipFileName${(if (file.isDirectory) "/" else "")}")
+                    zos.putNextEntry(entry)
+                    if (file.isFile) {
+                        file.inputStream().use { fis -> fis.copyTo(zos) }
+                    }
+                }
+            }
+            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.
+     */
+    private fun exportSave() {
+        CoroutineScope(Dispatchers.IO).launch {
+            val wasZipCreated = zipSave()
+            val lastZipFile = lastZipCreated
+            if (!wasZipCreated || lastZipFile == null) {
+                withContext(Dispatchers.Main) {
+                    Toast.makeText(context, "Failed to export save", Toast.LENGTH_LONG).show()
+                }
+                return@launch
+            }
+
+            withContext(Dispatchers.Main) {
+                val file = DocumentFile.fromSingleUri(
+                    context,
+                    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, "Share save file"))
+            }
+        }
+    }
+
+    /**
+     * Imports the save files contained in the zip file, and replaces any existing ones with the new save file.
+     * @param zipUri The Uri of the zip file containing the save file(s) to import.
+     */
+    private fun importSave(zipUri: Uri, activity: AppCompatActivity) {
+        val inputZip = context.contentResolver.openInputStream(zipUri)
+        // 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("${context.cacheDir.path}/saves/")
+        cacheSaveDir.mkdir()
+
+        if (inputZip == null) {
+            Toast.makeText(context, context.getString(R.string.fatal_error), Toast.LENGTH_LONG)
+                .show()
+            return
+        }
+
+        val filterTitleId =
+            FilenameFilter { _, dirName -> dirName.matches(Regex("^0100[\\dA-Fa-f]{12}$")) }
+
+        try {
+            CoroutineScope(Dispatchers.IO).launch {
+                FileUtil.unzip(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(
+                            requireActivity(),
+                            titleId = R.string.save_file_invalid_zip_structure,
+                            descriptionId = R.string.save_file_invalid_zip_structure_description
+                        ).show(activity.supportFragmentManager, MessageDialogFragment.TAG)
+                        return@withContext
+                    }
+                    Toast.makeText(
+                        context,
+                        context.getString(R.string.save_file_imported_success),
+                        Toast.LENGTH_LONG
+                    ).show()
+                }
+
+                cacheSaveDir.deleteRecursively()
+            }
+        } catch (e: Exception) {
+            Toast.makeText(context, context.getString(R.string.fatal_error), Toast.LENGTH_LONG)
+                .show()
+        }
+    }
+
+    companion object {
+        const val TAG = "ImportExportSavesFragment"
+    }
+}
@@ -4,14 +4,14 @@
 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.FragmentActivity
 import androidx.fragment.app.activityViewModels
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.ViewModelProvider
@@ -39,7 +39,9 @@ class IndeterminateProgressDialogFragment : DialogFragment() {
            .setView(binding.root)

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

        val alertDialog = dialog.create()
@@ -78,10 +80,6 @@ class IndeterminateProgressDialogFragment : DialogFragment() {
                                    requireActivity().supportFragmentManager,
                                    MessageDialogFragment.TAG
                                )
-
-                                else -> {
-                                    // Do nothing
-                                }
                            }
                            taskViewModel.clear()
                        }
@@ -100,18 +98,6 @@ 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"

@@ -119,7 +105,7 @@ class IndeterminateProgressDialogFragment : DialogFragment() {
        private const val CANCELLABLE = "Cancellable"

        fun newInstance(
-            activity: FragmentActivity,
+            activity: AppCompatActivity,
            titleId: Int,
            cancellable: Boolean = false,
            task: () -> Any
@@ -1,138 +0,0 @@
-// 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
-        }
-}
@@ -8,7 +8,6 @@ import android.content.DialogInterface
 import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
-import android.text.Html
 import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.FragmentActivity
 import androidx.fragment.app.activityViewModels
@@ -33,9 +32,7 @@ class MessageDialogFragment : DialogFragment() {
        if (titleId != 0) dialog.setTitle(titleId)
        if (titleString.isNotEmpty()) dialog.setTitle(titleString)

-        if (descriptionId != 0) {
-            dialog.setMessage(Html.fromHtml(getString(descriptionId), Html.FROM_HTML_MODE_LEGACY))
-        }
+        if (descriptionId != 0) dialog.setMessage(descriptionId)
        if (descriptionString.isNotEmpty()) dialog.setMessage(descriptionString)

        if (helpLinkId != 0) {
@@ -295,10 +295,8 @@ class SetupFragment : Fragment() {

    override fun onSaveInstanceState(outState: Bundle) {
        super.onSaveInstanceState(outState)
-        if (_binding != null) {
-            outState.putBoolean(KEY_NEXT_VISIBILITY, binding.buttonNext.isVisible)
-            outState.putBoolean(KEY_BACK_VISIBILITY, binding.buttonBack.isVisible)
-        }
+        outState.putBoolean(KEY_NEXT_VISIBILITY, binding.buttonNext.isVisible)
+        outState.putBoolean(KEY_BACK_VISIBILITY, binding.buttonBack.isVisible)
        outState.putBooleanArray(KEY_HAS_BEEN_WARNED, hasBeenWarned)
    }

@@ -355,15 +353,11 @@ class SetupFragment : Fragment() {
    }

    fun pageForward() {
-        if (_binding != null) {
-            binding.viewPager2.currentItem += 1
-        }
+        binding.viewPager2.currentItem = binding.viewPager2.currentItem + 1
    }

    fun pageBackward() {
-        if (_binding != null) {
-            binding.viewPager2.currentItem -= 1
-        }
+        binding.viewPager2.currentItem = binding.viewPager2.currentItem - 1
    }

    fun setPageWarned(page: Int) {
@@ -1,55 +0,0 @@
-// SPDX-FileCopyrightText: 2023 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-package org.yuzu.yuzu_emu.model
-
-import androidx.annotation.DrawableRes
-import androidx.annotation.StringRes
-import org.yuzu.yuzu_emu.R
-
-data class Applet(
-    @StringRes val titleId: Int,
-    @StringRes val descriptionId: Int,
-    @DrawableRes val iconId: Int,
-    val appletInfo: AppletInfo,
-    val cabinetMode: CabinetMode = CabinetMode.None
-)
-
-// Combination of Common::AM::Applets::AppletId enum and the entry id
-enum class AppletInfo(val appletId: Int, val entryId: Long = 0) {
-    None(0x00),
-    Application(0x01),
-    OverlayDisplay(0x02),
-    QLaunch(0x03),
-    Starter(0x04),
-    Auth(0x0A),
-    Cabinet(0x0B, 0x0100000000001002),
-    Controller(0x0C),
-    DataErase(0x0D),
-    Error(0x0E),
-    NetConnect(0x0F),
-    ProfileSelect(0x10),
-    SoftwareKeyboard(0x11),
-    MiiEdit(0x12, 0x0100000000001009),
-    Web(0x13),
-    Shop(0x14),
-    PhotoViewer(0x015, 0x010000000000100D),
-    Settings(0x16),
-    OfflineWeb(0x17),
-    LoginShare(0x18),
-    WebAuth(0x19),
-    MyPage(0x1A)
-}
-
-// Matches enum in Service::NFP::CabinetMode with extra metadata
-enum class CabinetMode(
-    val id: Int,
-    @StringRes val titleId: Int = 0,
-    @DrawableRes val iconId: Int = 0
-) {
-    None(-1),
-    StartNicknameAndOwnerSettings(0, R.string.cabinet_nickname_and_owner, R.drawable.ic_edit),
-    StartGameDataEraser(1, R.string.cabinet_game_data_eraser, R.drawable.ic_refresh),
-    StartRestorer(2, R.string.cabinet_restorer, R.drawable.ic_restore),
-    StartFormatter(3, R.string.cabinet_formatter, R.drawable.ic_clear)
-}
@@ -1,158 +0,0 @@
-// SPDX-FileCopyrightText: 2023 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-package org.yuzu.yuzu_emu.model
-
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.viewModelScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
-import org.yuzu.yuzu_emu.R
-import org.yuzu.yuzu_emu.YuzuApplication
-import org.yuzu.yuzu_emu.utils.FileUtil
-import org.yuzu.yuzu_emu.utils.GpuDriverHelper
-import org.yuzu.yuzu_emu.utils.GpuDriverMetadata
-import java.io.BufferedOutputStream
-import java.io.File
-
-class DriverViewModel : ViewModel() {
-    private val _areDriversLoading = MutableStateFlow(false)
-    val areDriversLoading: StateFlow<Boolean> get() = _areDriversLoading
-
-    private val _isDriverReady = MutableStateFlow(true)
-    val isDriverReady: StateFlow<Boolean> get() = _isDriverReady
-
-    private val _isDeletingDrivers = MutableStateFlow(false)
-    val isDeletingDrivers: StateFlow<Boolean> get() = _isDeletingDrivers
-
-    private val _driverList = MutableStateFlow(mutableListOf<Pair<String, GpuDriverMetadata>>())
-    val driverList: StateFlow<MutableList<Pair<String, GpuDriverMetadata>>> get() = _driverList
-
-    var previouslySelectedDriver = 0
-    var selectedDriver = -1
-
-    private val _selectedDriverMetadata =
-        MutableStateFlow(
-            GpuDriverHelper.customDriverData.name
-                ?: YuzuApplication.appContext.getString(R.string.system_gpu_driver)
-        )
-    val selectedDriverMetadata: StateFlow<String> get() = _selectedDriverMetadata
-
-    private val _newDriverInstalled = MutableStateFlow(false)
-    val newDriverInstalled: StateFlow<Boolean> get() = _newDriverInstalled
-
-    val driversToDelete = mutableListOf<String>()
-
-    val isInteractionAllowed
-        get() = !areDriversLoading.value && isDriverReady.value && !isDeletingDrivers.value
-
-    init {
-        _areDriversLoading.value = true
-        viewModelScope.launch {
-            withContext(Dispatchers.IO) {
-                val drivers = GpuDriverHelper.getDrivers()
-                val currentDriverMetadata = GpuDriverHelper.customDriverData
-                for (i in drivers.indices) {
-                    if (drivers[i].second == currentDriverMetadata) {
-                        setSelectedDriverIndex(i)
-                        break
-                    }
-                }
-
-                // If a user had installed a driver before the manager was implemented, this zips
-                // the installed driver to UserData/gpu_drivers/CustomDriver.zip so that it can
-                // be indexed and exported as expected.
-                if (selectedDriver == -1) {
-                    val driverToSave =
-                        File(GpuDriverHelper.driverStoragePath, "CustomDriver.zip")
-                    driverToSave.createNewFile()
-                    FileUtil.zipFromInternalStorage(
-                        File(GpuDriverHelper.driverInstallationPath!!),
-                        GpuDriverHelper.driverInstallationPath!!,
-                        BufferedOutputStream(driverToSave.outputStream())
-                    )
-                    drivers.add(Pair(driverToSave.path, currentDriverMetadata))
-                    setSelectedDriverIndex(drivers.size - 1)
-                }
-
-                _driverList.value = drivers
-                _areDriversLoading.value = false
-            }
-        }
-    }
-
-    fun setSelectedDriverIndex(value: Int) {
-        if (selectedDriver != -1) {
-            previouslySelectedDriver = selectedDriver
-        }
-        selectedDriver = value
-    }
-
-    fun setNewDriverInstalled(value: Boolean) {
-        _newDriverInstalled.value = value
-    }
-
-    fun addDriver(driverData: Pair<String, GpuDriverMetadata>) {
-        val driverIndex = _driverList.value.indexOfFirst { it == driverData }
-        if (driverIndex == -1) {
-            setSelectedDriverIndex(_driverList.value.size)
-            _driverList.value.add(driverData)
-            _selectedDriverMetadata.value = driverData.second.name
-                ?: YuzuApplication.appContext.getString(R.string.system_gpu_driver)
-        } else {
-            setSelectedDriverIndex(driverIndex)
-        }
-    }
-
-    fun removeDriver(driverData: Pair<String, GpuDriverMetadata>) {
-        _driverList.value.remove(driverData)
-    }
-
-    fun onCloseDriverManager() {
-        _isDeletingDrivers.value = true
-        viewModelScope.launch {
-            withContext(Dispatchers.IO) {
-                driversToDelete.forEach {
-                    val driver = File(it)
-                    if (driver.exists()) {
-                        driver.delete()
-                    }
-                }
-                driversToDelete.clear()
-                _isDeletingDrivers.value = false
-            }
-        }
-
-        if (GpuDriverHelper.customDriverData == driverList.value[selectedDriver].second) {
-            return
-        }
-
-        _isDriverReady.value = false
-        viewModelScope.launch {
-            withContext(Dispatchers.IO) {
-                if (selectedDriver == 0) {
-                    GpuDriverHelper.installDefaultDriver()
-                    setDriverReady()
-                    return@withContext
-                }
-
-                val driverToInstall = File(driverList.value[selectedDriver].first)
-                if (driverToInstall.exists()) {
-                    GpuDriverHelper.installCustomDriver(driverToInstall)
-                } else {
-                    GpuDriverHelper.installDefaultDriver()
-                }
-                setDriverReady()
-            }
-        }
-    }
-
-    private fun setDriverReady() {
-        _isDriverReady.value = true
-        _selectedDriverMetadata.value = GpuDriverHelper.customDriverData.name
-            ?: YuzuApplication.appContext.getString(R.string.system_gpu_driver)
-    }
-}
@@ -11,15 +11,16 @@ import kotlinx.serialization.Serializable
@Parcelize
@Serializable
 class Game(
-    val title: String = "",
+    val title: String,
+    val description: String,
+    val regions: String,
    val path: String,
-    val programId: String = "",
-    val developer: String = "",
-    val version: String = "",
-    val isHomebrew: Boolean = false
+    val gameId: String,
+    val company: String,
+    val isHomebrew: Boolean
 ) : Parcelable {
-    val keyAddedToLibraryTime get() = "${programId}_AddedToLibraryTime"
-    val keyLastPlayedTime get() = "${programId}_LastPlayed"
+    val keyAddedToLibraryTime get() = "${gameId}_AddedToLibraryTime"
+    val keyLastPlayedTime get() = "${gameId}_LastPlayed"

    override fun equals(other: Any?): Boolean {
        if (other !is Game) {
@@ -31,9 +32,11 @@ class Game(

    override fun hashCode(): Int {
        var result = title.hashCode()
+        result = 31 * result + description.hashCode()
+        result = 31 * result + regions.hashCode()
        result = 31 * result + path.hashCode()
-        result = 31 * result + programId.hashCode()
-        result = 31 * result + developer.hashCode()
+        result = 31 * result + gameId.hashCode()
+        result = 31 * result + company.hashCode()
        result = 31 * result + isHomebrew.hashCode()
        return result
    }
@@ -14,13 +14,15 @@ import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
+import kotlinx.serialization.ExperimentalSerializationApi
+import kotlinx.serialization.MissingFieldException
 import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.json.Json
 import org.yuzu.yuzu_emu.NativeLibrary
 import org.yuzu.yuzu_emu.YuzuApplication
 import org.yuzu.yuzu_emu.utils.GameHelper
-import org.yuzu.yuzu_emu.utils.GameMetadata

+@OptIn(ExperimentalSerializationApi::class)
 class GamesViewModel : ViewModel() {
    val games: StateFlow<List<Game>> get() = _games
    private val _games = MutableStateFlow(emptyList<Game>())
@@ -47,34 +49,26 @@ class GamesViewModel : ViewModel() {
        // Retrieve list of cached games
        val storedGames = PreferenceManager.getDefaultSharedPreferences(YuzuApplication.appContext)
            .getStringSet(GameHelper.KEY_GAMES, emptySet())
-
-        viewModelScope.launch {
-            withContext(Dispatchers.IO) {
-                if (storedGames!!.isNotEmpty()) {
-                    val deserializedGames = mutableSetOf<Game>()
-                    storedGames.forEach {
-                        val game: Game
-                        try {
-                            game = Json.decodeFromString(it)
-                        } catch (e: Exception) {
-                            // We don't care about any errors related to parsing the game cache
-                            return@forEach
-                        }
-
-                        val gameExists =
-                            DocumentFile.fromSingleUri(
-                                YuzuApplication.appContext,
-                                Uri.parse(game.path)
-                            )?.exists()
-                        if (gameExists == true) {
-                            deserializedGames.add(game)
-                        }
-                    }
-                    setGames(deserializedGames.toList())
+        if (storedGames!!.isNotEmpty()) {
+            val deserializedGames = mutableSetOf<Game>()
+            storedGames.forEach {
+                val game: Game
+                try {
+                    game = Json.decodeFromString(it)
+                } catch (e: MissingFieldException) {
+                    return@forEach
+                }
+
+                val gameExists =
+                    DocumentFile.fromSingleUri(YuzuApplication.appContext, Uri.parse(game.path))
+                        ?.exists()
+                if (gameExists == true) {
+                    deserializedGames.add(game)
                }
-                reloadGames(false)
            }
+            setGames(deserializedGames.toList())
        }
+        reloadGames(false)
    }

    fun setGames(games: List<Game>) {
@@ -112,7 +106,7 @@ class GamesViewModel : ViewModel() {

        viewModelScope.launch {
            withContext(Dispatchers.IO) {
-                GameMetadata.resetMetadata()
+                NativeLibrary.resetRomMetadata()
                setGames(GameHelper.getGames())
                _isReloading.value = false

@@ -1,13 +0,0 @@
-// 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
-)
@@ -50,9 +50,3 @@ class TaskViewModel : ViewModel() {
        }
    }
 }
-
-enum class TaskState {
-    Completed,
-    Failed,
-    Cancelled
-}
@@ -352,7 +352,7 @@ class InputOverlay(context: Context, attrs: AttributeSet?) :
    }

    private fun addOverlayControls(layout: String) {
-        val windowSize = getSafeScreenSize(context, Pair(measuredWidth, measuredHeight))
+        val windowSize = getSafeScreenSize(context)
        if (preferences.getBoolean(Settings.PREF_BUTTON_A, true)) {
            overlayButtons.add(
                initializeOverlayButton(
@@ -593,7 +593,7 @@ class InputOverlay(context: Context, attrs: AttributeSet?) :
    }

    private fun saveControlPosition(prefId: String, x: Int, y: Int, layout: String) {
-        val windowSize = getSafeScreenSize(context, Pair(measuredWidth, measuredHeight))
+        val windowSize = getSafeScreenSize(context)
        val min = windowSize.first
        val max = windowSize.second
        PreferenceManager.getDefaultSharedPreferences(YuzuApplication.appContext).edit()
@@ -968,17 +968,14 @@ class InputOverlay(context: Context, attrs: AttributeSet?) :
         * @return A pair of points, the first being the top left corner of the safe area,
         *                  the second being the bottom right corner of the safe area
         */
-        private fun getSafeScreenSize(
-            context: Context,
-            screenSize: Pair<Int, Int>
-        ): Pair<Point, Point> {
+        private fun getSafeScreenSize(context: Context): Pair<Point, Point> {
            // Get screen size
            val windowMetrics = WindowMetricsCalculator.getOrCreate()
                .computeCurrentWindowMetrics(context as Activity)
-            var maxX = screenSize.first.toFloat()
-            var maxY = screenSize.second.toFloat()
-            var minX = 0
+            var maxY = windowMetrics.bounds.height().toFloat()
+            var maxX = windowMetrics.bounds.width().toFloat()
            var minY = 0
+            var minX = 0

            // If we have API access, calculate the safe area to draw the overlay
            var cutoutLeft = 0
@@ -6,7 +6,6 @@ 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
@@ -20,7 +19,6 @@ 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,10 +27,11 @@ import androidx.navigation.fragment.NavHostFragment
 import androidx.navigation.ui.setupWithNavController
 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
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
@@ -41,23 +40,20 @@ import org.yuzu.yuzu_emu.NativeLibrary
 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.features.DocumentProvider
+import org.yuzu.yuzu_emu.databinding.DialogProgressBarBinding
 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.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
@@ -68,13 +64,6 @@ 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 }
@@ -340,10 +329,11 @@ class MainActivity : AppCompatActivity(), ThemeProvider {

        val dstPath = DirectoryInitialization.userDirectory + "/keys/"
        if (FileUtil.copyUriToInternalStorage(
+                applicationContext,
                result,
                dstPath,
                "prod.keys"
-            ) != null
+            )
        ) {
            if (NativeLibrary.reloadKeys()) {
                Toast.makeText(
@@ -391,7 +381,7 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
            val task: () -> Any = {
                var messageToShow: Any
                try {
-                    FileUtil.unzipToInternalStorage(BufferedInputStream(inputZip), cacheFirmwareDir)
+                    FileUtil.unzip(inputZip, cacheFirmwareDir)
                    val unfilteredNumOfFiles = cacheFirmwareDir.list()?.size ?: -1
                    val filteredNumOfFiles = cacheFirmwareDir.list(filterNCA)?.size ?: -2
                    messageToShow = if (unfilteredNumOfFiles != filteredNumOfFiles) {
@@ -403,7 +393,6 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
                    } else {
                        firmwarePath.deleteRecursively()
                        cacheFirmwareDir.copyRecursively(firmwarePath, true)
-                        NativeLibrary.initializeSystem()
                        getString(R.string.save_file_imported_success)
                    }
                } catch (e: Exception) {
@@ -443,10 +432,11 @@ class MainActivity : AppCompatActivity(), ThemeProvider {

            val dstPath = DirectoryInitialization.userDirectory + "/keys/"
            if (FileUtil.copyUriToInternalStorage(
+                    applicationContext,
                    result,
                    dstPath,
                    "key_retail.bin"
-                ) != null
+                )
            ) {
                if (NativeLibrary.reloadKeys()) {
                    Toast.makeText(
@@ -465,13 +455,66 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
            }
        }

+    val getDriver =
+        registerForActivityResult(ActivityResultContracts.OpenDocument()) { result ->
+            if (result == null) {
+                return@registerForActivityResult
+            }
+
+            val takeFlags =
+                Intent.FLAG_GRANT_WRITE_URI_PERMISSION or Intent.FLAG_GRANT_READ_URI_PERMISSION
+            contentResolver.takePersistableUriPermission(
+                result,
+                takeFlags
+            )
+
+            val progressBinding = DialogProgressBarBinding.inflate(layoutInflater)
+            progressBinding.progressBar.isIndeterminate = true
+            val installationDialog = MaterialAlertDialogBuilder(this)
+                .setTitle(R.string.installing_driver)
+                .setView(progressBinding.root)
+                .show()
+
+            lifecycleScope.launch {
+                withContext(Dispatchers.IO) {
+                    // Ignore file exceptions when a user selects an invalid zip
+                    try {
+                        GpuDriverHelper.installCustomDriver(applicationContext, result)
+                    } catch (_: IOException) {
+                    }
+
+                    withContext(Dispatchers.Main) {
+                        installationDialog.dismiss()
+
+                        val driverName = GpuDriverHelper.customDriverName
+                        if (driverName != null) {
+                            Toast.makeText(
+                                applicationContext,
+                                getString(
+                                    R.string.select_gpu_driver_install_success,
+                                    driverName
+                                ),
+                                Toast.LENGTH_SHORT
+                            ).show()
+                        } else {
+                            Toast.makeText(
+                                applicationContext,
+                                R.string.select_gpu_driver_error,
+                                Toast.LENGTH_LONG
+                            ).show()
+                        }
+                    }
+                }
+            }
+        }
+
    val installGameUpdate = registerForActivityResult(
        ActivityResultContracts.OpenMultipleDocuments()
    ) { documents: List<Uri> ->
        if (documents.isNotEmpty()) {
            IndeterminateProgressDialogFragment.newInstance(
                this@MainActivity,
-                R.string.installing_game_content
+                R.string.install_game_content
            ) {
                var installSuccess = 0
                var installOverwrite = 0
@@ -479,12 +522,7 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
                var errorExtension = 0
                var errorOther = 0
                documents.forEach {
-                    when (
-                        NativeLibrary.installFileToNand(
-                            it.toString(),
-                            FileUtil.getExtension(it)
-                        )
-                    ) {
+                    when (NativeLibrary.installFileToNand(it.toString())) {
                        NativeLibrary.InstallFileToNandResult.Success -> {
                            installSuccess += 1
                        }
@@ -586,17 +624,27 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
            R.string.exporting_user_data,
            true
        ) {
-            val zipResult = FileUtil.zipFromInternalStorage(
-                File(DirectoryInitialization.userDirectory!!),
-                DirectoryInitialization.userDirectory!!,
-                BufferedOutputStream(contentResolver.openOutputStream(result)),
-                taskViewModel.cancelled
+            val zos = ZipOutputStream(
+                BufferedOutputStream(contentResolver.openOutputStream(result))
            )
-            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
+            zos.use { stream ->
+                File(DirectoryInitialization.userDirectory!!).walkTopDown().forEach { file ->
+                    if (taskViewModel.cancelled.value) {
+                        return@newInstance R.string.user_data_export_cancelled
+                    }
+
+                    if (!file.isDirectory) {
+                        val newPath = file.path.substring(
+                            DirectoryInitialization.userDirectory!!.length,
+                            file.path.length
+                        )
+                        stream.putNextEntry(ZipEntry(newPath))
+                        stream.write(file.readBytes())
+                        stream.closeEntry()
+                    }
+                }
            }
+            return@newInstance getString(R.string.user_data_export_success)
        }.show(supportFragmentManager, IndeterminateProgressDialogFragment.TAG)
    }

@@ -616,185 +664,57 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
                checkStream.use { stream ->
                    var ze: ZipEntry? = null
                    while (stream.nextEntry?.also { ze = it } != null) {
-                        val itemName = ze!!.name.trim()
-                        if (itemName == "/config/config.ini" || itemName == "config/config.ini") {
+                        if (ze!!.name.trim() == "/config/config.ini") {
                            isYuzuBackup = true
                            return@use
                        }
                    }
                }
                if (!isYuzuBackup) {
-                    return@newInstance MessageDialogFragment.newInstance(
-                        this,
-                        titleId = R.string.invalid_yuzu_backup,
-                        descriptionId = R.string.user_data_import_failed_description
-                    )
+                    return@newInstance getString(R.string.invalid_yuzu_backup)
                }

-                // Clear existing user data
                File(DirectoryInitialization.userDirectory!!).deleteRecursively()

-                // 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
-                    )
+                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}"
+                            )
+                        }
+
+                        if (!destinationDirectory.isDirectory && !destinationDirectory.mkdirs()) {
+                            throw IOException("Failed to create directory $destinationDirectory")
+                        }
+
+                        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
+                    }
                }

                // Reinitialize relevant data
-                NativeLibrary.initializeSystem()
+                NativeLibrary.initializeEmulation()
                gamesViewModel.reloadGames(false)

                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()
-            }
-        }
 }
@@ -0,0 +1,70 @@
+// SPDX-FileCopyrightText: 2023 yuzu Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+package org.yuzu.yuzu_emu.utils
+
+import android.view.InputDevice
+import android.view.KeyEvent
+import android.view.MotionEvent
+
+/**
+ * Some controllers have incorrect mappings. This class has special-case fixes for them.
+ */
+class ControllerMappingHelper {
+    /**
+     * Some controllers report extra button presses that can be ignored.
+     */
+    fun shouldKeyBeIgnored(inputDevice: InputDevice, keyCode: Int): Boolean {
+        return if (isDualShock4(inputDevice)) {
+            // The two analog triggers generate analog motion events as well as a keycode.
+            // We always prefer to use the analog values, so throw away the button press
+            keyCode == KeyEvent.KEYCODE_BUTTON_L2 || keyCode == KeyEvent.KEYCODE_BUTTON_R2
+        } else {
+            false
+        }
+    }
+
+    /**
+     * Scale an axis to be zero-centered with a proper range.
+     */
+    fun scaleAxis(inputDevice: InputDevice, axis: Int, value: Float): Float {
+        if (isDualShock4(inputDevice)) {
+            // Android doesn't have correct mappings for this controller's triggers. It reports them
+            // as RX & RY, centered at -1.0, and with a range of [-1.0, 1.0]
+            // Scale them to properly zero-centered with a range of [0.0, 1.0].
+            if (axis == MotionEvent.AXIS_RX || axis == MotionEvent.AXIS_RY) {
+                return (value + 1) / 2.0f
+            }
+        } else if (isXboxOneWireless(inputDevice)) {
+            // Same as the DualShock 4, the mappings are missing.
+            if (axis == MotionEvent.AXIS_Z || axis == MotionEvent.AXIS_RZ) {
+                return (value + 1) / 2.0f
+            }
+            if (axis == MotionEvent.AXIS_GENERIC_1) {
+                // This axis is stuck at ~.5. Ignore it.
+                return 0.0f
+            }
+        } else if (isMogaPro2Hid(inputDevice)) {
+            // This controller has a broken axis that reports a constant value. Ignore it.
+            if (axis == MotionEvent.AXIS_GENERIC_1) {
+                return 0.0f
+            }
+        }
+        return value
+    }
+
+    // Sony DualShock 4 controller
+    private fun isDualShock4(inputDevice: InputDevice): Boolean {
+        return inputDevice.vendorId == 0x54c && inputDevice.productId == 0x9cc
+    }
+
+    // Microsoft Xbox One controller
+    private fun isXboxOneWireless(inputDevice: InputDevice): Boolean {
+        return inputDevice.vendorId == 0x45e && inputDevice.productId == 0x2e0
+    }
+
+    // Moga Pro 2 HID
+    private fun isMogaPro2Hid(inputDevice: InputDevice): Boolean {
+        return inputDevice.vendorId == 0x20d6 && inputDevice.productId == 0x6271
+    }
+}
@@ -15,7 +15,7 @@ object DirectoryInitialization {
    fun start() {
        if (!areDirectoriesReady) {
            initializeInternalStorage()
-            NativeLibrary.initializeSystem()
+            NativeLibrary.initializeEmulation()
            areDirectoriesReady = true
        }
    }
@@ -7,6 +7,7 @@ import android.net.Uri
 import androidx.documentfile.provider.DocumentFile
 import java.io.File
 import java.util.*
+import org.yuzu.yuzu_emu.YuzuApplication
 import org.yuzu.yuzu_emu.model.MinimalDocumentFile

 class DocumentsTree {
@@ -21,7 +22,7 @@ class DocumentsTree {

    fun openContentUri(filepath: String, openMode: String?): Int {
        val node = resolvePath(filepath) ?: return -1
-        return FileUtil.openContentUri(node.uri.toString(), openMode)
+        return FileUtil.openContentUri(YuzuApplication.appContext, node.uri.toString(), openMode)
    }

    fun getFileSize(filepath: String): Long {
@@ -29,7 +30,7 @@ class DocumentsTree {
        return if (node == null || node.isDirectory) {
            0
        } else {
-            FileUtil.getFileSize(node.uri.toString())
+            FileUtil.getFileSize(YuzuApplication.appContext, node.uri.toString())
        }
    }

@@ -42,23 +43,6 @@ class DocumentsTree {
        return node != null && node.isDirectory
    }

-    fun getParentDirectory(filepath: String): String {
-        val node = resolvePath(filepath)!!
-        val parentNode = node.parent
-        if (parentNode != null && parentNode.isDirectory) {
-            return parentNode.uri!!.toString()
-        }
-        return node.uri!!.toString()
-    }
-
-    fun getFilename(filepath: String): String {
-        val node = resolvePath(filepath)
-        if (node != null) {
-            return node.name!!
-        }
-        return filepath
-    }
-
    private fun resolvePath(filepath: String): DocumentsNode? {
        val tokens = StringTokenizer(filepath, File.separator, false)
        var iterator = root
@@ -83,7 +67,7 @@ class DocumentsTree {
     * @param parent parent node of this level
     */
    private fun structTree(parent: DocumentsNode) {
-        val documents = FileUtil.listFiles(parent.uri!!)
+        val documents = FileUtil.listFiles(YuzuApplication.appContext, parent.uri!!)
        for (document in documents) {
            val node = DocumentsNode(document)
            node.parent = parent
@@ -3,13 +3,14 @@

 package org.yuzu.yuzu_emu.utils

+import android.content.Context
 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
 import java.io.IOException
 import java.io.InputStream
 import java.net.URLDecoder
@@ -17,11 +18,6 @@ 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.lang.NullPointerException
-import java.nio.charset.StandardCharsets
-import java.util.zip.ZipOutputStream

 object FileUtil {
    const val PATH_TREE = "tree"
@@ -29,8 +25,6 @@ object FileUtil {
    const val APPLICATION_OCTET_STREAM = "application/octet-stream"
    const val TEXT_PLAIN = "text/plain"

-    private val context get() = YuzuApplication.appContext
-
    /**
     * Create a file from directory with filename.
     * @param context Application context
@@ -38,11 +32,11 @@ object FileUtil {
     * @param filename file display name.
     * @return boolean
     */
-    fun createFile(directory: String?, filename: String): DocumentFile? {
+    fun createFile(context: Context?, directory: String?, filename: String): DocumentFile? {
        var decodedFilename = filename
        try {
            val directoryUri = Uri.parse(directory)
-            val parent = DocumentFile.fromTreeUri(context, directoryUri) ?: return null
+            val parent = DocumentFile.fromTreeUri(context!!, directoryUri) ?: return null
            decodedFilename = URLDecoder.decode(decodedFilename, DECODE_METHOD)
            var mimeType = APPLICATION_OCTET_STREAM
            if (decodedFilename.endsWith(".txt")) {
@@ -58,15 +52,16 @@ object FileUtil {

    /**
     * Create a directory from directory with filename.
+     * @param context Application context
     * @param directory parent path for directory.
     * @param directoryName directory display name.
     * @return boolean
     */
-    fun createDir(directory: String?, directoryName: String?): DocumentFile? {
+    fun createDir(context: Context?, directory: String?, directoryName: String?): DocumentFile? {
        var decodedDirectoryName = directoryName
        try {
            val directoryUri = Uri.parse(directory)
-            val parent = DocumentFile.fromTreeUri(context, directoryUri) ?: return null
+            val parent = DocumentFile.fromTreeUri(context!!, directoryUri) ?: return null
            decodedDirectoryName = URLDecoder.decode(decodedDirectoryName, DECODE_METHOD)
            val isExist = parent.findFile(decodedDirectoryName)
            return isExist ?: parent.createDirectory(decodedDirectoryName)
@@ -78,12 +73,13 @@ object FileUtil {

    /**
     * Open content uri and return file descriptor to JNI.
+     * @param context Application context
     * @param path Native content uri path
     * @param openMode will be one of "r", "r", "rw", "wa", "rwa"
     * @return file descriptor
     */
    @JvmStatic
-    fun openContentUri(path: String, openMode: String?): Int {
+    fun openContentUri(context: Context, path: String, openMode: String?): Int {
        try {
            val uri = Uri.parse(path)
            val parcelFileDescriptor = context.contentResolver.openFileDescriptor(uri, openMode!!)
@@ -103,10 +99,11 @@ object FileUtil {
    /**
     * Reference:  https://stackoverflow.com/questions/42186820/documentfile-is-very-slow
     * This function will be faster than DoucmentFile.listFiles
+     * @param context Application context
     * @param uri Directory uri.
     * @return CheapDocument lists.
     */
-    fun listFiles(uri: Uri): Array<MinimalDocumentFile> {
+    fun listFiles(context: Context, uri: Uri): Array<MinimalDocumentFile> {
        val resolver = context.contentResolver
        val columns = arrayOf(
            DocumentsContract.Document.COLUMN_DOCUMENT_ID,
@@ -144,7 +141,7 @@ object FileUtil {
     * @param path Native content uri path
     * @return bool
     */
-    fun exists(path: String?, suppressLog: Boolean = false): Boolean {
+    fun exists(context: Context, path: String?): Boolean {
        var c: Cursor? = null
        try {
            val mUri = Uri.parse(path)
@@ -152,9 +149,7 @@ object FileUtil {
            c = context.contentResolver.query(mUri, columns, null, null, null)
            return c!!.count > 0
        } catch (e: Exception) {
-            if (!suppressLog) {
-                Log.info("[FileUtil] Cannot find file from given path, error: " + e.message)
-            }
+            Log.info("[FileUtil] Cannot find file from given path, error: " + e.message)
        } finally {
            closeQuietly(c)
        }
@@ -166,7 +161,7 @@ object FileUtil {
     * @param path content uri path
     * @return bool
     */
-    fun isDirectory(path: String): Boolean {
+    fun isDirectory(context: Context, path: String): Boolean {
        val resolver = context.contentResolver
        val columns = arrayOf(
            DocumentsContract.Document.COLUMN_MIME_TYPE
@@ -211,10 +206,10 @@ object FileUtil {
        return filename
    }

-    fun getFilesName(path: String): Array<String> {
+    fun getFilesName(context: Context, path: String): Array<String> {
        val uri = Uri.parse(path)
        val files: MutableList<String> = ArrayList()
-        for (file in listFiles(uri)) {
+        for (file in listFiles(context, uri)) {
            files.add(file.filename)
        }
        return files.toTypedArray()
@@ -226,7 +221,7 @@ object FileUtil {
     * @return long file size
     */
    @JvmStatic
-    fun getFileSize(path: String): Long {
+    fun getFileSize(context: Context, path: String): Long {
        val resolver = context.contentResolver
        val columns = arrayOf(
            DocumentsContract.Document.COLUMN_SIZE
@@ -246,100 +241,71 @@ object FileUtil {
        return size
    }

-    /**
-     * Creates an input stream with a given [Uri] and copies its data to the given path. This will
-     * overwrite any pre-existing files.
-     *
-     * @param sourceUri The [Uri] to copy data from
-     * @param destinationParentPath Destination directory
-     * @param destinationFilename Optionally renames the file once copied
-     */
    fun copyUriToInternalStorage(
-        sourceUri: Uri,
+        context: Context,
+        sourceUri: Uri?,
        destinationParentPath: String,
-        destinationFilename: String = ""
-    ): File? =
+        destinationFilename: String
+    ): Boolean {
+        var input: InputStream? = null
+        var output: FileOutputStream? = null
        try {
-            val fileName =
-                if (destinationFilename == "") getFilename(sourceUri) else "/$destinationFilename"
-            val inputStream = context.contentResolver.openInputStream(sourceUri)!!
-
-            val destinationFile = File("$destinationParentPath$fileName")
-            if (destinationFile.exists()) {
-                destinationFile.delete()
+            input = context.contentResolver.openInputStream(sourceUri!!)
+            output = FileOutputStream("$destinationParentPath/$destinationFilename")
+            val buffer = ByteArray(1024)
+            var len: Int
+            while (input!!.read(buffer).also { len = it } != -1) {
+                output.write(buffer, 0, len)
            }
-
-            destinationFile.outputStream().use { fos ->
-                inputStream.use { it.copyTo(fos) }
+            output.flush()
+            return true
+        } catch (e: Exception) {
+            Log.error("[FileUtil]: Cannot copy file, error: " + e.message)
+        } finally {
+            if (input != null) {
+                try {
+                    input.close()
+                } catch (e: IOException) {
+                    Log.error("[FileUtil]: Cannot close input file, error: " + e.message)
+                }
+            }
+            if (output != null) {
+                try {
+                    output.close()
+                } catch (e: IOException) {
+                    Log.error("[FileUtil]: Cannot close output file, error: " + e.message)
+                }
            }
-            destinationFile
-        } catch (e: IOException) {
-            null
-        } catch (e: NullPointerException) {
-            null
        }
+        return false
+    }

    /**
     * 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 unzipToInternalStorage(zipStream: BufferedInputStream, destDir: File) {
-        ZipInputStream(zipStream).use { zis ->
+    fun unzip(zipStream: InputStream, destDir: File): Boolean {
+        ZipInputStream(BufferedInputStream(zipStream)).use { zis ->
            var entry: ZipEntry? = zis.nextEntry
            while (entry != null) {
-                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}")
+                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)
                }
-
-                if (!destinationDirectory.isDirectory && !destinationDirectory.mkdirs()) {
-                    throw IOException("Failed to create directory $destinationDirectory")
-                }
-
-                if (!entry.isDirectory) {
-                    newFile.outputStream().use { fos -> zis.copyTo(fos) }
+                if (entry.isDirectory) {
+                    entryFile.mkdirs()
+                } else {
+                    entryFile.parentFile?.mkdirs()
+                    entryFile.createNewFile()
+                    entryFile.outputStream().use { fos -> zis.copyTo(fos) }
                }
                entry = zis.nextEntry
            }
        }
-    }

-    /**
-     * 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
+        return true
    }

    fun isRootTreeUri(uri: Uri): Boolean {
@@ -363,12 +329,4 @@ object FileUtil {
        return fileName.substring(fileName.lastIndexOf(".") + 1)
            .lowercase()
    }
-
-    @Throws(IOException::class)
-    fun getStringFromFile(file: File): String =
-        String(file.readBytes(), StandardCharsets.UTF_8)
-
-    @Throws(IOException::class)
-    fun getStringFromInputStream(stream: InputStream): String =
-        String(stream.readBytes(), StandardCharsets.UTF_8)
 }
@@ -30,7 +30,7 @@ object GameHelper {
        // Ensure keys are loaded so that ROM metadata can be decrypted.
        NativeLibrary.reloadKeys()

-        addGamesRecursive(games, FileUtil.listFiles(gamesUri), 3)
+        addGamesRecursive(games, FileUtil.listFiles(context, gamesUri), 3)

        // Cache list of games found on disk
        val serializedGames = mutableSetOf<String>()
@@ -58,7 +58,7 @@ object GameHelper {
            if (it.isDirectory) {
                addGamesRecursive(
                    games,
-                    FileUtil.listFiles(it.uri),
+                    FileUtil.listFiles(YuzuApplication.appContext, it.uri),
                    depth - 1
                )
            } else {
@@ -71,26 +71,27 @@ object GameHelper {

    fun getGame(uri: Uri, addedToLibrary: Boolean): Game {
        val filePath = uri.toString()
-        var name = GameMetadata.getTitle(filePath)
+        var name = NativeLibrary.getTitle(filePath)

        // If the game's title field is empty, use the filename.
        if (name.isEmpty()) {
            name = FileUtil.getFilename(uri)
        }
-        var programId = GameMetadata.getProgramId(filePath)
+        var gameId = NativeLibrary.getGameId(filePath)

        // If the game's ID field is empty, use the filename without extension.
-        if (programId.isEmpty()) {
-            programId = name.substring(0, name.lastIndexOf("."))
+        if (gameId.isEmpty()) {
+            gameId = name.substring(0, name.lastIndexOf("."))
        }

        val newGame = Game(
            name,
+            NativeLibrary.getDescription(filePath).replace("\n", " "),
+            NativeLibrary.getRegions(filePath),
            filePath,
-            programId,
-            GameMetadata.getDeveloper(filePath),
-            GameMetadata.getVersion(filePath),
-            GameMetadata.getIsHomebrew(filePath)
+            gameId,
+            NativeLibrary.getCompany(filePath),
+            NativeLibrary.isHomebrew(filePath)
        )

        if (addedToLibrary) {
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
michael-oberpriller	6b7d5cf3d8	Conditional to non-android	2023-09-25 15:11:49 -05:00
Michael Oberpriller	16a6a67e34	Revert "host_memory: Allocate virtual_base with MAP_NORESERVE" This reverts commit `4d7be85e73`. Fix VK_ERROR_OUT_OF_DEVICE_MEMORY	2023-09-22 09:33:09 -05:00