Hesham/wireguard-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tv: show volume descriptions for file picker

Browse Source 
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
This commit is contained in:
Jason A. Donenfeld 2020-09-24 11:29:03 +02:00
parent 4bf34c49b7
commit e729c5dc51
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ui/src/main/java/com/wireguard/android/activity/TvMainActivity.kt
View File

@ -204,9 +204,9 @@ class TvMainActivity : AppCompatActivity() {
val storageManager: StorageManager = getSystemService() ?: return@withContext list
list.addAll(storageManager.storageVolumes.mapNotNull { volume ->
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
volume.directory?.let { KeyedFile(it.canonicalPath) }
volume.directory?.let { KeyedFile(it.canonicalPath, volume.getDescription(this@TvMainActivity)) }
} else {
KeyedFile((StorageVolume::class.java.getMethod("getPathFile").invoke(volume) as File).canonicalPath)
KeyedFile((StorageVolume::class.java.getMethod("getPathFile").invoke(volume) as File).canonicalPath, volume.getDescription(this@TvMainActivity))
}
})
} else {
@ -319,9 +319,9 @@ class TvMainActivity : AppCompatActivity() {
}
}
class KeyedFile(pathname: String) : File(pathname), Keyed<String> {
class KeyedFile(pathname: String, private val forcedKey: String? = null) : File(pathname), Keyed<String> {
override val key: String
get() = if (isDirectory) "$name/" else name
get() = forcedKey ?: if (isDirectory) "$name/" else name
}
companion object {