allow setting the Recycle bin and Favorites folders as defaults

This commit is contained in:
tibbi 2020-11-09 12:39:10 +01:00
parent 98e297fec0
commit 58a838f770

View file

@ -1420,18 +1420,18 @@ class MainActivity : SimpleActivity(), DirectoryOperationsListener {
private fun openDefaultFolder() { private fun openDefaultFolder() {
if (config.defaultFolder.isEmpty()) { if (config.defaultFolder.isEmpty()) {
return; return
} }
val defaultDir = File(config.defaultFolder!!) val defaultDir = File(config.defaultFolder)
if (!defaultDir.exists() || !defaultDir.isDirectory) { if ((!defaultDir.exists() || !defaultDir.isDirectory) && (config.defaultFolder != RECYCLE_BIN && config.defaultFolder != FAVORITES)) {
config.defaultFolder = "" config.defaultFolder = ""
return; return
} }
Intent(this, MediaActivity::class.java).apply { Intent(this, MediaActivity::class.java).apply {
putExtra(DIRECTORY, defaultDir.path) putExtra(DIRECTORY, config.defaultFolder)
handleMediaIntent(this) handleMediaIntent(this)
} }
} }