Browse Source
[android] Try and fix SD Card storage mount points for external paths (#3436)
Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/3436
Reviewed-by: DraVee <chimera@dravee.dev>
Reviewed-by: MaranBr <maranbr@eden-emu.dev>
Co-authored-by: nekle <nekle@protonmail.com>
Co-committed-by: nekle <nekle@protonmail.com>
pull/3674/head
nekle
6 days ago
committed by
crueter
No known key found for this signature in database
GPG Key ID: 425ACD2D4830EBC6
1 changed files with
7 additions and
9 deletions
-
src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/PathUtil.kt
|
|
@ -1,4 +1,4 @@ |
|
|
// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project |
|
|
|
|
|
|
|
|
// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project |
|
|
// SPDX-License-Identifier: GPL-3.0-or-later |
|
|
// SPDX-License-Identifier: GPL-3.0-or-later |
|
|
|
|
|
|
|
|
package org.yuzu.yuzu_emu.utils |
|
|
package org.yuzu.yuzu_emu.utils |
|
|
@ -80,16 +80,14 @@ object PathUtil { |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
// This really shouldn't be necessary, but the Android API seemingly |
|
|
|
|
|
// doesn't have a way of doing this? |
|
|
|
|
|
// Apparently, on certain devices the mount location can vary, so add |
|
|
|
|
|
// extra cases here if we discover any new ones. |
|
|
|
|
|
fun getRemovableStoragePath(idString: String): String? { |
|
|
fun getRemovableStoragePath(idString: String): String? { |
|
|
var pathFile: File |
|
|
|
|
|
|
|
|
val possibleMountPaths = listOf("/mnt/media_rw/$idString", "/storage/$idString") |
|
|
|
|
|
|
|
|
pathFile = File("/mnt/media_rw/$idString"); |
|
|
|
|
|
if (pathFile.exists()) { |
|
|
|
|
|
return pathFile.absolutePath |
|
|
|
|
|
|
|
|
for (mountPath in possibleMountPaths) { |
|
|
|
|
|
val pathFile = File(mountPath); |
|
|
|
|
|
if (pathFile.exists()) { |
|
|
|
|
|
return pathFile.absolutePath |
|
|
|
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
return null |
|
|
return null |
|
|
|