feat: default storage for new installs, with USB/SDCARD/SSD detection (#1520)

* feat: choose default storage for new store installs

Store installs and the Epic Games Launcher can use internal storage, external storage, a folder picked through Choose folder..., or ask every time. The choice is stored in SessionPrefs and used by StoreInstallRoot; Storage > Default storage exposes it.

* fix: allow choosing any folder for default storage

The default storage choice can now hold an arbitrary folder path, not just internal or app-specific external storage. StoreInstallRoot resolves and validates picked folders, keeps a disconnected choice instead of silently falling back, and the folder picker stays available from Storage.

* fix: keep the Epic install folder when external storage is away

* test: use a unique missing folder for the Epic storage check

* fix: detect USB SSDs that the storage manager hides

List storage volumes that have no UUID instead of dropping them, keep volumes that are present but not yet mounted, and fall back to parsing /proc/mounts so USB OTG drives appear even when Android does not expose them as storage volumes or app directories. Prefer the system's volume description for removable drives. (Raw removable drives as move targets, the folder-picker fallback, and the unreadable-drive guidance follow with the move stack.)

* fix: compare mount paths as strings in StorageRootsTest

* fix: never drop a present storage volume from the drive list

Key volumes by description or index when they report no UUID and no directory, keep nofs/unmountable states so a plugged-in drive stays visible with guidance, only attach app directories on strict UUID matches, and accept any fstype under vold-managed locations plus usb-ish mounts directly under /mnt.

* fix: probe folder writes with a fresh temp file and keep Epic's folder unset while external storage is away

---------

Co-authored-by: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com>
This commit is contained in:
ianandKurt Himebauch authored and GitHub committed 2026-10-25 16:38:06 -04:00
1 parent 38926b3157
commit ee3f32d31e
13 files changed
+526 -29

No files matched your search

@@ -0,0 +1,71 @@
package com.droiddeck.launcher.files
import org.junit.Assert.assertEquals
import org.junit.Assert.assertTrue
import org.junit.Test
class StorageRootsTest {
@Test fun usbAndSdMountsAreFound() {
val mounts = """
/dev/fuse /mnt/user/0/emulated fuse rw,nosuid,nodev 0 0
/dev/block/vold/public:8,1 /mnt/media_rw/A1B2-C3D4 vfat rw,dirsync 0 0
/mnt/media_rw/A1B2-C3D4 /storage/A1B2-C3D4 fuse rw,nosuid,nodev 0 0
/dev/block/vold/public:179,65 /mnt/media_rw/9C33-1A2B exfat rw,dirsync 0 0
/mnt/media_rw/9C33-1A2B /storage/9C33-1A2B fuse rw,nosuid,nodev 0 0
/dev/block/dm-5 /data ext4 rw,seclabel 0 0
""".trimIndent()
val points = StorageRoots.parseExternalMounts(mounts).map { it.path }
assertTrue(points.contains("/storage/A1B2-C3D4"))
assertTrue(points.contains("/storage/9C33-1A2B"))
assertTrue(points.contains("/mnt/media_rw/A1B2-C3D4"))
}
@Test fun voldLocationsCountWhateverTheFstypeIs() {
val mounts = """
/dev/block/sda1 /storage/0D19-CC0A fuse rw,nosuid,nodev 0 0
/dev/block/sda1 /mnt/media_rw/0D19-CC0A exfat rw,dirsync 0 0
""".trimIndent()
val points = StorageRoots.parseExternalMounts(mounts).map { it.path }
assertTrue(points.contains("/storage/0D19-CC0A"))
assertTrue(points.contains("/mnt/media_rw/0D19-CC0A"))
}
@Test fun usbMountsDirectlyUnderMntAreFound() {
val mounts = """
/dev/block/sda1 /mnt/usb_storage exfat rw,dirsync 0 0
tmpfs /mnt/media_rw tmpfs rw,seclabel 0 0
/dev/fuse /mnt/user/0/emulated fuse rw,nosuid,nodev 0 0
""".trimIndent()
val points = StorageRoots.parseExternalMounts(mounts).map { it.path }
assertTrue(points.contains("/mnt/usb_storage"))
assertEquals(1, points.size)
}
@Test fun emulatedAndSystemMountsAreIgnored() {
val mounts = """
/dev/fuse /mnt/user/0/emulated fuse rw,nosuid,nodev 0 0
/mnt/media_rw/emulated /storage/emulated sdcardfs rw,nosuid,nodev 0 0
tmpfs /storage/self tmpfs rw,seclabel 0 0
overlay /system ext4 ro,seclabel 0 0
/dev/block/sda1 /data ext4 rw,seclabel 0 0
""".trimIndent()
assertEquals(emptyList<String>(), StorageRoots.parseExternalMounts(mounts).map { it.path })
}
@Test fun escapedSpacesAndNtfsAreHandled() {
val mounts = "/dev/block/vold/public:8,1 /mnt/media_rw/My\\040USB ntfs rw,dirsync 0 0\n" +
"/mnt/media_rw/My\\040USB /storage/My\\040USB fuse rw,nosuid,nodev 0 0\n"
val points = StorageRoots.parseExternalMounts(mounts).map { it.path }
assertTrue(points.contains("/mnt/media_rw/My USB"))
assertTrue(points.contains("/storage/My USB"))
}
}
@@ -5,7 +5,10 @@ import com.droiddeck.launcher.session.SessionPrefs
import java.io.File
import org.junit.Assert.assertEquals
import org.junit.Assert.assertFalse
import org.junit.Assert.assertNotNull
import org.junit.Assert.assertNull
import org.junit.Assert.assertTrue
import org.junit.Before
import org.junit.Test
import org.junit.runner.RunWith
import org.robolectric.RobolectricTestRunner
@@ -18,6 +21,12 @@ import org.robolectric.shadows.ShadowStatFs
class StoreInstallRootTest {
private val app get() = RuntimeEnvironment.getApplication()
@Before fun resetStoragePreferences() {
SessionPrefs.setDefaultStorageFolder(app, "", "")
SessionPrefs.setDefaultStorage(app, SessionPrefs.DEFAULT_STORAGE_ASK)
SessionPrefs.setGameStorage(app, SessionPrefs.GAME_STORAGE_OFF, "")
}
@Test fun theDefaultRootIsInternalWhateverTheSteamLibrarySettingSays() {
val card = File(app.filesDir, "fake-card/steam").apply { mkdirs() }
SessionPrefs.setGameStorage(app, card.path, "Card")
@@ -26,6 +35,72 @@ class StoreInstallRootTest {
assertFalse(StoreInstallRoot.targets(app).first().removable)
}
@Test fun defaultStoragePicksTheInternalOrTheConfiguredExternalTarget() {
val library = File(app.filesDir, "default-card/steam").apply { mkdirs() }
SessionPrefs.setGameStorage(app, library.path, "Card")
val external = File(library, "Games")
SessionPrefs.setDefaultStorage(app, SessionPrefs.DEFAULT_STORAGE_INTERNAL)
assertEquals(StoreInstallRoot.internalRoot(app).absolutePath, StoreInstallRoot.defaultTarget(app)?.root?.absolutePath)
SessionPrefs.setDefaultStorage(app, SessionPrefs.DEFAULT_STORAGE_EXTERNAL)
assertEquals(external.absolutePath, StoreInstallRoot.defaultTarget(app)?.root?.absolutePath)
SessionPrefs.setDefaultStorage(app, SessionPrefs.DEFAULT_STORAGE_ASK)
assertNull(StoreInstallRoot.defaultTarget(app))
SessionPrefs.setDefaultStorage(app, "bogus")
assertEquals(SessionPrefs.DEFAULT_STORAGE_ASK, SessionPrefs.defaultStorage(app))
}
@Test fun defaultExternalStorageFallsBackToTheInstallDialogWhenNoCardIsPresent() {
SessionPrefs.setGameStorage(app, SessionPrefs.GAME_STORAGE_OFF, "")
SessionPrefs.setDefaultStorage(app, SessionPrefs.DEFAULT_STORAGE_EXTERNAL)
assertNull(StoreInstallRoot.defaultTarget(app))
}
@Test fun aChosenFolderIsUsedForDefaultExternalStorage() {
val folder = File(app.filesDir, "usb/SSD").apply { mkdirs() }
assertNull(StoreInstallRoot.prepareDefaultFolder(app, folder))
val root = File(folder, "Games")
assertTrue(root.isDirectory)
SessionPrefs.setDefaultStorageFolder(app, folder.path, "SSD")
SessionPrefs.setDefaultStorage(app, SessionPrefs.DEFAULT_STORAGE_EXTERNAL)
assertEquals(root.absolutePath, StoreInstallRoot.defaultTarget(app)?.root?.absolutePath)
assertTrue(StoreInstallRoot.targets(app).any { it.root.absolutePath == root.absolutePath && it.folder })
assertTrue(StoreInstallRoot.roots(app).any { it.absolutePath == root.absolutePath })
assertTrue(StoreInstallRoot.externalRoots(app).any { it.first.absolutePath == root.absolutePath })
assertFalse(File(root, ".droiddeck-write-probe").exists())
}
@Test fun aDisconnectedChosenFolderDoesNotFallBackToAnotherTarget() {
val card = File(app.filesDir, "card/steam").apply { mkdirs() }
SessionPrefs.setGameStorage(app, card.path, "Card")
val folder = File(app.filesDir, "usb/SSD").apply { mkdirs() }
SessionPrefs.setDefaultStorageFolder(app, folder.path, "SSD")
SessionPrefs.setDefaultStorage(app, SessionPrefs.DEFAULT_STORAGE_EXTERNAL)
assertNotNull(StoreInstallRoot.defaultTarget(app))
assertTrue(folder.delete())
assertNull(StoreInstallRoot.defaultTarget(app))
assertEquals(File(card, "Games").absolutePath, StoreInstallRoot.detectedExternalTarget(app)?.root?.absolutePath)
}
@Test fun filesOnAChosenFolderAreMappedIntoTheGuest() {
val folder = File(app.filesDir, "usb/SSD").apply { mkdirs() }
SessionPrefs.setDefaultStorageFolder(app, folder.path, "SSD")
val game = File(folder, "Games/GOG/Test/game.exe").apply {
parentFile?.mkdirs()
writeText("MZ")
}
val guest = StoreInstallRoot.externalGuestPath(app, game)
assertNotNull(guest)
assertTrue(guest!!.startsWith(StoreInstallRoot.GUEST_EXTERNAL + "/"))
assertTrue(guest.endsWith("/GOG/Test/game.exe"))
}
@Test fun theSteamLibraryFolderIsOfferedAsAnInstallTarget() {
val library = File(app.filesDir, "Documents/Games").apply { mkdirs() }
SessionPrefs.setGameStorage(app, library.path, "Games")
@@ -456,4 +456,26 @@ class EpicClientTest {
settings.writeText("""{"defaultInstallDir":"/mnt/droiddeck-sd/Stores/Epic"}""")
assertEquals("/root/Games/Stores/Epic", EpicClient.prepareInstallDir(context))
}
@Test fun aDisconnectedDefaultFolderKeepsTheLauncherInstallDir() {
val context = org.robolectric.RuntimeEnvironment.getApplication()
val previousStorage = com.droiddeck.launcher.session.SessionPrefs.defaultStorage(context)
val previousFolder = com.droiddeck.launcher.session.SessionPrefs.defaultStorageFolder(context)
val previousLabel = com.droiddeck.launcher.session.SessionPrefs.defaultStorageFolderLabel(context)
val settings = File(EpicClient.dataDir(context), "settings/app-settings.json").apply { parentFile!!.mkdirs() }
val current = "/mnt/droiddeck-stores/1234/Epic"
settings.writeText("""{"defaultInstallDir":"$current"}""")
com.droiddeck.launcher.session.SessionPrefs.setDefaultStorage(
context, com.droiddeck.launcher.session.SessionPrefs.DEFAULT_STORAGE_EXTERNAL)
com.droiddeck.launcher.session.SessionPrefs.setDefaultStorageFolder(
context, File(context.filesDir, "missing-${System.nanoTime()}").path, "SSD")
try {
assertEquals(current, EpicClient.prepareInstallDir(context))
assertEquals(current, org.json.JSONObject(settings.readText()).getString("defaultInstallDir"))
} finally {
com.droiddeck.launcher.session.SessionPrefs.setDefaultStorage(context, previousStorage)
if (previousFolder.isBlank()) com.droiddeck.launcher.session.SessionPrefs.clearDefaultStorageFolder(context)
else com.droiddeck.launcher.session.SessionPrefs.setDefaultStorageFolder(context, previousFolder, previousLabel)
}
}
}