Skip to content

Meaningful storage name in picker #17974

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alperozturk96 merged 2 commits into from
Nov 9, 2026
+19 −2
Merged

Meaningful storage name in picker #17974

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2fe98d7
Meaningful storage name in picker
daniele-verducci Nov 5, 2026
cd96bb9
Fix null volume edge case causing activity finish()
daniele-verducci Nov 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 19 additions & 2 deletions app/src/main/java/com/owncloud/android/ui/activity/UploadFilesActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import android.app.Activity
import android.content.Intent
import android.os.Bundle
import android.os.Environment
import android.os.storage.StorageManager
import android.view.Menu
import android.view.MenuInflater
import android.view.MenuItem
Expand Down Expand Up @@ -94,6 +95,7 @@ class UploadFilesActivity :
private var optionsMenu: Menu? = null
private var searchView: SearchView? = null
private var chosenFilePaths: Array<String>? = null
private val androidStorageManager by lazy { getSystemService(StorageManager::class.java) }

private val isRoot: Boolean
get() = currentDir?.absolutePath == ROOT_DIR
Expand Down Expand Up @@ -485,10 +487,25 @@ class UploadFilesActivity :
}

private fun ArrayAdapter<String>.addDirectoryHierarchy(directory: File?) {
val volume = directory?.let { androidStorageManager.getStorageVolume(it) }

// Fallback to full path
if (volume == null) {
generateSequence(directory) { it.parentFile }
.takeWhile { it.parentFile != null }
.forEach { add(it.name) }
add(File.separator)
return
}

// Show user-readable path
generateSequence(directory) { it.parentFile }
.takeWhile { it.parentFile != null }
.takeWhile { dir ->
dir.parentFile?.let { androidStorageManager.getStorageVolume(it) } == volume
}
.forEach { add(it.name) }
add(File.separator)

add(volume.getDescription(this@UploadFilesActivity))
}

companion object {
Expand Down
Loading